Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 8540ad3becf6a2627b6b2793a79d2688a1223340

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

@@ -202,6 +202,9 @@
    @ApiModelProperty(value = "区编号")
    @TableField("district_code")
    private String districtCode;
    @ApiModelProperty(value = "区编号")
    @TableField("qr_code")
    private String qrCode;

    @ApiModelProperty("等级1会员数")
    @TableField(exist = false)