Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-27 2d73575643e28451484a65edc2fa78d404b19cbe

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java

@@ -45,6 +45,14 @@
    @TableField("phone")
    private String phone;

    @ApiModelProperty(value = "省名称")
    @TableField("province")
    private String province;

    @ApiModelProperty(value = "省编号")
    @TableField("province_code")
    private String provinceCode;

    @ApiModelProperty(value = "市名称")
    @TableField("city")
    private String city;

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/TAppUserAddressMapper.xml

@@ -8,6 +8,8 @@
        <result column="app_user_id" property="appUserId" />
        <result column="name" property="name" />
        <result column="phone" property="phone" />
        <result column="province" property="province" />
        <result column="provinceCode" property="provinceCode" />
        <result column="city" property="city" />
        <result column="city_code" property="cityCode" />
        <result column="address" property="address" />
@@ -20,7 +22,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, app_user_id, name, phone, city, city_code, address, lon, lat, default_address, create_time, del_flag
        id, app_user_id, name, phone, province,provinceCode,city, city_code, address, lon, lat, default_address, create_time, del_flag
    </sql>

</mapper>