From a139dba9262dbb4b70f34d3c2034c255561abcad Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
index f532df6..1c9da11 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
@@ -349,7 +349,13 @@
h.remark as cancelRemark,
CONCAT(j.startTime, '-', j.endTime) as lineShiftTime,
a.holidayFee,
- a.discountAmount as taxiCardMoney
+ a.discountAmount as taxiCardMoney,
+ a.responsibilityType,
+ a.abnormalStatus,
+ a.abnormalRemark,
+ a.abnormalIntro,
+ a.abnormalImg,
+ a.companyId
from t_order_cross_city a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
--
Gitblit v1.7.1