From ac0906df88505ec24ee910899a036676823f9d63 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 8 ++++----
1 files changed, 4 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..87c0781 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -223,22 +223,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
--
Gitblit v1.9.1