From 5ac80d6a06f686a62c307c52c652e511e3896fb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 十一月 2023 16:44:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

---
 src/main/java/com/zy/core/model/command/CrnCommand.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 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 ea0e950..15e1d8e 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -42,13 +42,13 @@
     @JSONField(serialize = false)
     private CrnTaskModeType taskModeType;
 
-    // 婧愪綅缃帓鍙�
+    // 婧愪綅缃垪鍙�
     private Short sourcePosX = 0;
 
-    // 婧愪綅缃垪鍙�
+    // 婧愪綅缃眰鍙�
     private Short sourcePosY = 0;
 
-    // 婧愪綅缃眰鍙�
+    // 婧愪綅缃帓鍙�
     private Short sourcePosZ = 0;
 
     // 婧愮珯
@@ -72,11 +72,23 @@
     // 鐩爣宸烽亾
     private Short destinationLane = 0;
 
+    //鑱旀満妯″紡
+    private Short auto = 0;
+
+    //鐢宠瀹屾垚浠诲姟
+    private Short onlineWrk1 = 0;
+    //鐢宠鍙栨秷浠诲姟
+    private Short onlineWrk2 = 0;
+    //娓呴櫎鑱旀満浠诲姟
+    private Short onlineWrk3 = 0;
+    //鎭㈠鑱旀満浠诲姟
+    private Short onlineWrk4 = 0;
+
     // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
     private Short command = 0;
 
-    //鎸囦护淇℃伅
-    private CommandInfo commandInfo;
+    //鎸囦护ID
+    private Integer commandId;
 
     public void setTaskMode(Short taskMode){
         this.taskMode = taskMode;

--
Gitblit v1.9.1