Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

 src/main/java/com/moral/mapper/ShAreaMapper.java

@@ -7,6 +7,6 @@

public interface ShAreaMapper extends BaseMapper<Area> {

    Map<String,Object> getgeography(String name);
    Map<String,Object> getGeography(String name);

}