Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

 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> {
}