From 0001861cc63fc670646a103284b9eaefb193e91f Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 10 八月 2024 17:31:48 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml index 1ea3ead..75c57bb 100644 --- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml +++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml @@ -177,7 +177,7 @@ b.carLicensePlate as licensePlate, b.carColor as carColor, b.vehicleId, - CONCAT(d.`name`, c.`name`) as brand, + CONCAT(d.`name`, ' ', c.`name`) as brand, ( (select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9)) + (select count(id) from t_order_taxi where driverId = a.id and state in (7, 8, 9)) + -- Gitblit v1.7.1