From 3efe34fdc1dfe58e16c8689faf086b38b2d73e83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 16 三月 2026 16:41:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0

---
 src/main/java/com/zy/core/thread/CrnThread.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 50011bc..6c0b86b 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -13,11 +13,9 @@
 
     CrnCommand getMoveCommand(String targetLocNo, Integer taskNo, Integer crnNo);//绉诲姩
 
-    CrnCommand getResetCommand(Integer crnNo);//澶嶄綅
+    CrnCommand getResetCommand(Integer taskNo, Integer crnNo);//澶嶄綅
 
     CommandResponse sendCommand(CrnCommand command);//涓嬪彂鍛戒护
-
-    CommandResponse sendCommand1(CrnCommand command);
 
     CommandResponse sendCommand2(CrnCommand command);
 

--
Gitblit v1.9.1