合并代码

puzhibing

2024-12-18 ceb2e49dd10822de0f6665ae485240d1f568ec87

合并代码

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java

@@ -14,7 +14,7 @@
public class CommissionStatistics {

    @ApiModelProperty(value = "分佣总计")
    private Integer totalCommission;
    private BigDecimal totalCommission;

    @ApiModelProperty(value = "分页数据", required = true)
    private IPage<BalanceChangeRecord> userPointPage;
@@ -22,6 +22,7 @@
    public CommissionStatistics() {
    }
    public CommissionStatistics(BigDecimal totalCommission, Page<BalanceChangeRecord> changeRecordPage) {

        this.totalCommission = totalCommission;
        this.userPointPage = changeRecordPage;
    }
}