From e1ab7f1517041275be4b2e30210b2b65736b9d4a Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 16 三月 2022 13:02:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmwcs' into xgmwcs
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 10 ----------
1 files changed, 0 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..147eef5 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -94,19 +94,9 @@
public Short walkPos;
/**
- * 鍫嗗灈鏈轰换鍔″畬鎴�
- */
- public Short taskFinish;
-
- /**
* 杞借揣鍙版湁鐗�
*/
public Short loaded;
-
- /**
- * 寮傚父鐮侊紙鏁板�兼樉绀猴級
- */
- private Short alarm1;
private Short temp1;
--
Gitblit v1.9.1