Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 e84eea43fa967fdb9cebc2a1146d32d5cc1d09ef

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

@@ -30,6 +30,10 @@

    @TableId("id")
    private Long id;

    @TableField(exist = false)
    private String idStr;

    @TableField(exist = false)
    private String uid;