Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-12 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41

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