From f6fd3607f046744e86f391956d91d0f009bb3adb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 22:50:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 6fcee03..02fceb1 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -196,8 +196,8 @@
}
@Override
- public List<Driver> queryDriversByLineAndCarModel(Integer serverCarModelId, Integer lineId) throws Exception {
- List<Driver> drivers = driverMapper.queryDriversByLineAndCarModel(serverCarModelId, lineId);
+ public List<Driver> queryDriversByLineAndCarModel(Integer type,Integer serverCarModelId, Integer lineId) throws Exception {
+ List<Driver> drivers = driverMapper.queryDriversByLineAndCarModel( type,serverCarModelId, lineId);
return drivers;
}
}
--
Gitblit v1.7.1