Merge remote-tracking branch 'origin/master'

fengxiang

2018-09-20 a31c81dada74c63ff96c7adf7f21451f1e3ad989

 src/main/java/com/moral/mapper/CityMapper.java

@@ -2,9 +2,6 @@

import com.moral.common.mapper.BaseMapper;
import com.moral.entity.City;
import com.moral.entity.CityExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;

public interface CityMapper extends BaseMapper<City> {
}