From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/resources/mapper/account/AccountIncomeMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/account/AccountIncomeMapper.xml b/src/main/resources/mapper/account/AccountIncomeMapper.xml
index 4acb504..e4f3361 100644
--- a/src/main/resources/mapper/account/AccountIncomeMapper.xml
+++ b/src/main/resources/mapper/account/AccountIncomeMapper.xml
@@ -76,7 +76,7 @@
IFNULL(SUM(income_money), 0) AS amount
FROM account_income
WHERE income_date BETWEEN #{startDate} AND #{endDate}
- AND business_type = 1
+# AND business_type = 1
GROUP BY dateStr
ORDER BY dateStr
--
Gitblit v1.9.3