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/TReassignController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index b933f6c..4cc0539 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -314,8 +314,8 @@
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(tReassign.getOrderId());
orderCancel.setOrderType(tReassign.getOrderType());
- orderCancel.setReason("调度端取消订单");
- orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setReason("The platform cancels the order");
+ orderCancel.setRemark("The platform cancels the order");
orderCancel.setState(2);
orderCancel.setInsertTime(new Date());
orderCancel.setUserType(3);
@@ -476,8 +476,8 @@
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(tReassign.getOrderId());
orderCancel.setOrderType(tReassign.getOrderType());
- orderCancel.setReason("调度端取消订单");
- orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setReason("The platform cancels the order");
+ orderCancel.setRemark("The platform cancels the order");
orderCancel.setState(2);
orderCancel.setInsertTime(new Date());
orderCancel.setUserType(3);
@@ -540,8 +540,8 @@
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(tReassign.getOrderId());
orderCancel.setOrderType(tReassign.getOrderType());
- orderCancel.setReason("调度端取消订单");
- orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setReason("The platform cancels the order");
+ orderCancel.setRemark("The platform cancels the order");
orderCancel.setState(2);
orderCancel.setInsertTime(new Date());
orderCancel.setUserType(3);
--
Gitblit v1.7.1