From c904f735e0b8a488ef56744c08f8e10258639bce Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:54:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 6fbaa43..e2cdeec 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -54,6 +54,8 @@
      */
     public Short status;
 
+    public Short alarm = 0;
+
     /**
      * 鐘舵�佹灇涓�
      */
@@ -223,22 +225,22 @@
     /**
      * 鍫嗗灈鏈哄瀭鐩存晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
      */
-    private Integer alarm1;
+    private Integer alarm1 = 0;
 
     /**
      * 鍫嗗灈鏈烘按骞虫晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
      */
-    private Integer alarm2;
+    private Integer alarm2 = 0;;
 
     /**
      * 鍫嗗灈鏈鸿揣鍙夋晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
      */
-    private Integer alarm3;
+    private Integer alarm3 = 0;;
 
     /**
      * 鍫嗗灈鏈虹姸鎬佹晠闅滀唬鐮侊紙鏁板�兼樉绀猴級
      */
-    private Integer alarm4;
+    private Integer alarm4 = 0;;
 
     /**
      * 寮傚父1
@@ -303,6 +305,9 @@
      */
     public Float yDuration = 0F;
 
+    //鎸囦护ID
+    private Integer commandId;
+
     public void setMode(Short mode) {
         this.mode = mode;
         this.modeType = CrnModeType.get(mode);

--
Gitblit v1.9.1