From b60ecc7f25ed10848faaf050f071168a85b9e1f0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 21 四月 2026 17:21:01 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master
---
src/main/java/com/zy/asrs/controller/WrkMastController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 535c355..c27a3ae 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -90,7 +90,7 @@
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
highPrivilegeGrantService.assertGranted(request.getHeader("token"), "鍙栨秷浠诲姟");
- return commonService.cancelTask(param, true) ? R.ok() : R.error("浠诲姟鍙栨秷澶辫触");
+ return commonService.forceCancelTask(param) ? R.ok() : R.error("浠诲姟鍙栨秷澶辫触");
}
private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
--
Gitblit v1.9.1