Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-29 2ac80d588a68f60084d8bcc02aabd18c91100267

 src/main/java/com/moral/service/AreaService.java

@@ -11,5 +11,5 @@
    List<City> getCities(int provinceCode);
    List<Area> getAreas(int cityCode);

    String selectFullNameByCode(Integer code);
    String queryFullNameByCode(Integer code);
}