Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

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

public interface ShAreaMapper extends BaseMapper<Area> {

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

}