Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-12-23 e745dd38c5a413eaa000c7c5434621fbcd1800d5

 src/main/resources/mapper/CityMapper.xml

@@ -6,4 +6,9 @@
    <result column="city_name" property="cityName" jdbcType="VARCHAR" />
    <result column="province_code" property="provinceCode" jdbcType="INTEGER" />
  </resultMap>

  <select id="getCityByName" resultType="com.moral.entity.City" resultMap="BaseResultMap">
    select * from city
    where city_name like '%${name}%' limit 0,1
  </select>
</mapper>