From 1f25a5804e4561db6697c42ff5187d31971ae9ca Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 18 四月 2024 20:07:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/asrs/controller/CrnController.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index e076aaf..e4fcfca 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -385,13 +385,7 @@
return crnControl(command)?R.ok():R.error();
}
- @ManagerAuth(memo = "瑙ｉ攣灏忚溅")
- @PostMapping("/lock")
- public R lock(CrnOperatorParam param){
- RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, param.getCrnNo());
- rgvThread.setPakMk(true);
- return R.ok();
- }
+
// @ManagerAuth(memo = "鏆傚仠")
// @PostMapping("/operator/pause")
--
Gitblit v1.9.1