From 1b5604f8a88000e2f51d4c989fd179989468ee67 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 11 八月 2025 09:48:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys' into pim_ywx
---
src/main/java/com/ruoyi/account/dto/AccountDto3.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/dto/AccountDto3.java b/src/main/java/com/ruoyi/account/dto/AccountDto3.java
index 4792b65..33b4b8e 100644
--- a/src/main/java/com/ruoyi/account/dto/AccountDto3.java
+++ b/src/main/java/com/ruoyi/account/dto/AccountDto3.java
@@ -4,12 +4,10 @@
import java.io.Serializable;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
- * 璐㈠姟绠＄悊--璐㈠姟鎶ヨ〃骞存煡璇�
+ * 璐㈠姟绠＄悊--璐㈠姟鎶ヨ〃(绫诲瀷)
*/
@Data
@@ -17,14 +15,23 @@
/**
- * 鏈堜唤
+ * 绫诲瀷
*/
- private List<String> month;
+ private String typeName;
+
/**
- * 鍚勭被鍨嬮噾棰�
+ * 鐧惧垎鍗犳瘮
*/
- private Map<String, List<AccountDto2>> accountType;
+ private BigDecimal proportion;
+
+
+
+ /**
+ * 閲戦
+ */
+ private List<BigDecimal> account;
+
--
Gitblit v1.9.3