From 8f98ff2e202e5d7a39be484753db63d0165d70d7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 15:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_xindao

---
 src/main/java/com/ruoyi/account/mapper/AccountIncomeMapper.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/mapper/AccountIncomeMapper.java b/src/main/java/com/ruoyi/account/mapper/AccountIncomeMapper.java
index 1d4db3d..76a3c55 100644
--- a/src/main/java/com/ruoyi/account/mapper/AccountIncomeMapper.java
+++ b/src/main/java/com/ruoyi/account/mapper/AccountIncomeMapper.java
@@ -22,4 +22,5 @@
     List<AccountIncome> accountIncomeExport(@Param("accountIncome") AccountIncome accountIncome);
 
     List<AccountDto2> report(@Param("dateQueryDto") DateQueryDto dateQueryDto);
+    BigDecimal report1(@Param("dateQueryDto") DateQueryDto dateQueryDto, @Param("dictValue") String dictValue);
 }

--
Gitblit v1.9.3