Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

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

@@ -148,11 +148,8 @@
    @ApiModelProperty(value = "分销总金额")
    @TableField("total_distribution_amount")
    private BigDecimal totalDistributionAmount;
    
    @ApiModelProperty(value = "账户余额")
    @TableField("balance")
    private BigDecimal balance;
    


    @ApiModelProperty(value = "剩余积分")
    @TableField("lave_point")
    private Integer lavePoint;
@@ -194,24 +191,31 @@
    private String districtCode;

    @ApiModelProperty("等级1会员数")
    @TableField(exist = false)
    private Long count1;

    @ApiModelProperty("等级2会员数")
    @TableField(exist = false)
    private Long count2;

    @ApiModelProperty("等级3会员数")
    @TableField(exist = false)
    private Long count3;

    @ApiModelProperty("等级4会员数")
    @TableField(exist = false)
    private Long count4;

    @ApiModelProperty("等级5会员数")
    @TableField(exist = false)
    private Long count5;

    @ApiModelProperty("等级6会员数")
    @TableField(exist = false)
    private Long count6;

    @ApiModelProperty("等级7会员数")
    @TableField(exist = false)
    private Long count7;