From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 4 ++--
1 files changed, 2 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 9b7c802..69a8c25 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
@@ -158,7 +158,7 @@
orderMoney as orderMoney,
payMoney as payMoney,
(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney
- from t_order_logistics as a where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
+ from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -225,7 +225,7 @@
a.state as state,
a.oldState as oldState,
DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
+ DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime,
DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
DATE_FORMAT(a.travelTime, '%Y-%m-%d %H:%i:%s') as travelTime1,
a.startLon as startLon,
--
Gitblit v1.7.1