From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
index 44c5c68..e0dbbf9 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCompanyMapper.xml
@@ -66,7 +66,7 @@
SELECT * FROM (SELECT ui.account,IFNULL(ci.num,0) as franchiseeNum,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
case when cc.isTaxi = 1 then '出租车,' else '' end,
- case when cc.isCross = 1 then '直通车,' else '' end,
+ case when cc.isCross = 1 then '跨城,' else '' end,
case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
@@ -125,7 +125,7 @@
SELECT * FROM (SELECT ui.account,ci.`name` as companyName,IFNULL(ca.num,0) as carNumber,IFNULL(di.num,0) as driverNumber,
CONCAT(case when cc.isSpe = 1 then '专车,' else '' end,
case when cc.isTaxi = 1 then '出租车,' else '' end,
- case when cc.isCross = 1 then '直通车,' else '' end,
+ case when cc.isCross = 1 then '跨城,' else '' end,
case when cc.isCrossLogistics = 1 then '跨城小件物流,' else '' end,
case when cc.isSameLogistics = 1 then '同城小件物流,' else '' end,
case when cc.isCharter = 1 then '包车,' else '' end) as serverStr,
--
Gitblit v1.7.1