From 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 25 十月 2024 12:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs

---
 src/main/java/com/zy/core/model/command/CrnCommand.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index cb00a30..c777ecb 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -18,7 +18,7 @@
     private Integer crnNo = 0;
 
     // 浠诲姟瀹屾垚纭浣�
-//    private Short ackFinish = 0;
+    private Short ackFinish = 0;
 
     // 浠诲姟鍙�
     private Short taskNo = 0;
@@ -71,6 +71,9 @@
     // 鐩爣宸烽亾
     private Short destinationLane = 0;
 
+    // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+    private Short command = 0;
+
     public void setTaskMode(Short taskMode){
         this.taskMode = taskMode;
         this.taskModeType = CrnTaskModeType.get(taskModeType);

--
Gitblit v1.9.1