Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/resources/mapper/AreaMapper.xml

@@ -11,4 +11,9 @@
    select * from area
    where area_name like '%${name}%' limit 0,1
  </select>

  <select id="getAreaByCityCode" resultType="com.moral.entity.Area" resultMap="BaseResultMap">
    select * from area
    where city_code=#{cityCode}
  </select>
</mapper>