Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-24 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16

 src/main/java/com/moral/entity/AreaNames.java

@@ -7,4 +7,6 @@
    private String provinceName;
    private String cityName;
    private String areaName;
    private String townName;
    private String villageName;
}