Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-06-12 9009798abd7abfd726bcda80267c7d53dd3b8da3

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