From ea12b685190254228d88a0de261b1e399fcbf15b Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 25 十二月 2025 15:11:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/shzhjxydwcs_cs20251105' into shzhjxydwcs_cs20251105
---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 8 +++++++-
1 files changed, 7 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 9258620..aed7e20 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -202,8 +202,14 @@
public String errCrn;
- public String locMastDemoCount;//娴嬭瘯搴撲綅鏁伴噺
+ public Integer locMastDemoCount;//娴嬭瘯搴撲綅鏁伴噺
+ public ArrayList<String> locMastDemoListF;//娴嬭瘯搴撲綅鍒楄〃
+ public ArrayList<String> locMastDemoListE;//娴嬭瘯搴撲綅鍒楄〃
public ArrayList<String> locMastDemoList;//娴嬭瘯搴撲綅鍒楄〃
+ public ArrayList<String[]> locMastDemoListSign;//娴嬭瘯搴撲綅鍒楄〃
+ public Integer staOutDemo;//娴嬭瘯搴撲綅鍑哄簱绔�
+ public Integer staIntDemo;//娴嬭瘯搴撲綅鍏ュ簱绔�
+ public boolean signIntOut;//娴嬭瘯搴撲綅鍏ュ簱绔�
public void setMode(Short mode) {
this.mode = mode;
--
Gitblit v1.9.1