Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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