From f1ba329891967bca6d083a9d5722683a9fa2080b Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期一, 22 九月 2025 09:17:10 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/ZhaoYangChuXing --- ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java index 001f8be..d2bb475 100644 --- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java +++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java @@ -117,7 +117,7 @@ * @param companyId * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>> */ - List<Map<String, Object>> queryDriverIncomeData(Page<Map<String, Object>> page, Integer type, String start,String end, Integer companyId); + List<Map<String, Object>> queryDriverIncomeData(Page<Map<String, Object>> page, String driverName, String start,String end, Integer companyId); /** * @@ -129,7 +129,7 @@ * @param companyId * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>> */ - List<Map<String, Object>> queryDriverIncomeDataNoPage(Integer type, String start, String end, Integer companyId); + List<Map<String, Object>> queryDriverIncomeDataNoPage(String driverName, String start, String end, Integer companyId); /** * 修改司机分组id -- Gitblit v1.7.1