Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-19 17e2f65826b3b69871e45c88238e5c7317f7ecb7

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

@@ -31,6 +31,13 @@
    @TableId("id")
    private Long id;

    @TableField(exist = false)
    private String idStr;

    @TableField(exist = false)
    private String uid;


    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;