Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

 src/main/resources/mapper/ProvinceMapper.xml

@@ -5,7 +5,7 @@
        <id column="province_code" property="provinceCode" jdbcType="INTEGER" />
        <result column="province_name" property="provinceName" jdbcType="VARCHAR" />
    </resultMap>
    <select id="getProvinceByProvinceCode" resultType="com.moral.entity.Province">
    <select id="getProvinceByProvinceCode" resultType="com.moral.entity.Province" resultMap="BaseResultMap">
        select * from province where province_code=#{provinceCode}
    </select>
</mapper>