From 2de95b175c2a68d7ce28fb453204b602a1a8fdb8 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 06 五月 2024 17:57:32 +0800 Subject: [PATCH] 合并代码 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java index 7e41e53..20216b8 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IIncomeService.java @@ -30,7 +30,7 @@ * @return * @throws Exception */ - List<Map<String, Object>> query(Integer userType, Integer objectId, Integer type, Integer pageNum, Integer size) throws Exception; + List<Map<String, Object>> query(Integer language, Integer userType, Integer objectId, List<Integer> type, Integer pageNum, Integer size) throws Exception; -- Gitblit v1.7.1