From 21569e095e2c707e87634d6b94526a6609f902a9 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 17 二月 2025 13:42:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shuttle_rcs' into shuttle_rcs
---
src/main/java/com/zy/common/service/CommonService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 4e32bd5..c9df23c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -110,8 +110,9 @@
throw new CoolException("浠诲姟涓嶅瓨鍦�");
}
- wrkMastLogService.save(wrkNo);
- wrkMastService.deleteById(wrkNo);
+ wrkMast.setMk("taskCancel");
+ wrkMast.setModiTime(new Date());
+ wrkMastService.updateById(wrkMast);
return true;
}
--
Gitblit v1.9.1