From 57909bfeb70e80689cfe515198e3a30ad3868bb8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 07 八月 2024 09:35:28 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
index f32ab2b..21c2778 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -162,7 +162,8 @@
(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney,
cancelMidway,
tripId,
- remark
+ remark,
+ companyId
from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -286,7 +287,8 @@
h.reason as cancelReason,
h.remark as cancelRemark,
a.tripId,
- a.snatchOrderTime
+ a.snatchOrderTime,
+ a.startDuration
from t_order_logistics 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