From b610e067cf2c44fdcc99ec3a3190820d1a5b7bcb Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |    2 +-
 1 files changed, 1 insertions(+), 1 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 da02598..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,7 +54,7 @@
      */
     public Short status;
 
-    public Short alarm;
+    public Short alarm = 0;
 
     /**
      * 鐘舵�佹灇涓�

--
Gitblit v1.9.1