From f9fff682ff6b21344401bb86f85d25c97c37b073 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 七月 2024 17:01:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
index f2e5e35..58bce26 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
@@ -120,7 +120,7 @@
//修改行程信息
try {
- fleetEngineUtil.updateTrip("CANCELED", null, null, 4, tOrderLogistics.getId(), null, null, null, null);
+ fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderLogistics.getTripId(), null, null, null, null);
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1