From 606e7c14e9a73c20028896f4e681a3f2c42e20fc Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 11 五月 2024 11:41:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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