From d59956a6d7b12d122f7dbdfaecd46688697e6be0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 二月 2024 14:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel

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

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
index 6259cfc..c240920 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
@@ -90,6 +90,9 @@
     @ResponseBody
     public Object immediately(TIntegralOrder tIntegralOrder) {
         tIntegralOrder.setState(2);
+        tIntegralOrder.setManageRemark(tIntegralOrder.getRemark());
+        tIntegralOrder.setRemark(null);
+
         tIntegralOrderService.updateById(tIntegralOrder);
         return SUCCESS_TIP;
     }

--
Gitblit v1.7.1