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

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 8388146..5177098 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -295,8 +295,8 @@
         OrderCancel orderCancel = new OrderCancel();
         orderCancel.setOrderId(tOrderPrivateCarId);
         orderCancel.setOrderType(1);
-        orderCancel.setReason("平台取消订单");
-        orderCancel.setRemark("平台取消订单");
+        orderCancel.setReason("The platform cancels the order");
+        orderCancel.setRemark("The platform cancels the order");
         orderCancel.setUserType(2);
         orderCancel.setState(2);
         orderCancel.setInsertTime(new Date());

--
Gitblit v1.7.1