Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-07-06 4a99552e883976adc8b726499caaebbe36f19ea7

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