From 1b679d0941f2e2b61b9c4b007aa8bc3b6e555e9c Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 28 十一月 2022 08:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index a47b9c0..e1dcbd9 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -14,6 +14,11 @@
public class CrnProtocol {
/**
+ * 鍫嗗灈鏈哄彿
+ */
+ private Integer crnNo;
+
+ /**
* 1 = 鎵嬪姩妯″紡
* 2 = 鑷姩妯″紡
* 3 = 鐢佃剳妯″紡
@@ -94,19 +99,9 @@
public Short walkPos;
/**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public Short taskFinish;
-
- /**
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
-
- /**
- * 寮傚父鐮侊紙鏁板�兼樉绀猴級
- */
- private Short alarm1;
private Short temp1;
--
Gitblit v1.9.1