Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-15 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b

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

}