From 503bc89c55d675a27b689419aa906a070ca5cb03 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 24 五月 2024 09:33:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml index 42e6e9c..9c7ef43 100644 --- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml +++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCarMapper.xml @@ -67,6 +67,7 @@ when type = 4 then '小件物流-同城' when type = 5 then '小件物流-跨城' when type = 6 then '包车' + when type = 7 then '接送机' else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o <where> @@ -127,6 +128,7 @@ when type = 4 then '小件物流-同城' when type = 5 then '小件物流-跨城' when type = 6 then '包车' + when type = 7 then '接送机' else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o <where> -- Gitblit v1.7.1