Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/resources/mapper/ShAreaMapper.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.moral.mapper.ShAreaMapper" >
  <select id="getgeography" resultType="java.util.Map">
  <select id="getGeography" resultType="java.util.Map">
    select lng,lat,altitude,vegetation,river from sh_area
    where name=#{name}
  </select>