From 6b3a3251bc06b081903dfe94134f034608c18ba4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 16:03:01 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java
index 7233cd7..24f543e 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/vo/CommissionStatistics.java
+++ b/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;
}
}
--
Gitblit v1.7.1