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/service/AccountIncomeService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
index a92a51a..fc30cda 100644
--- a/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
+++ b/src/main/java/com/ruoyi/account/service/AccountIncomeService.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.account.pojo.AccountFile;
+import com.ruoyi.account.dto.AccountDto2;
+import com.ruoyi.account.dto.AccountDto3;
import com.ruoyi.account.pojo.AccountIncome;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
public interface AccountIncomeService extends IService<AccountIncome> {
@@ -14,4 +16,6 @@
IPage<AccountIncome> accountIncomeListPage(Page page, AccountIncome accountIncome);
void accountIncomeExport(HttpServletResponse response, AccountIncome accountIncome);
+
+ List<AccountDto3> reportIncome();
}
--
Gitblit v1.9.3