From 7ce3c22d4bf8fae793379fed1ca22c05e822ce7e Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 22 十二月 2025 11:24:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java
index b29af9a..cf6f4d6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java
@@ -37,9 +37,9 @@
 
     @ApiModelProperty("推广员收益")
     @Excel(name = "推广员收益", orderNum = "6", width = 20)
-    private BigDecimal saleProfit=BigDecimal.ZERO;
+    private Integer saleProfit=0;
 
     @ApiModelProperty("合伙人收益")
     @Excel(name = "合伙人收益", orderNum = "7", width = 20)
-    private BigDecimal partnerProfit=BigDecimal.ZERO;
+    private Integer partnerProfit=0;
 }

--
Gitblit v1.7.1