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 | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 1def4c8..aed7e20 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -7,6 +7,8 @@
import com.zy.core.enums.CrnStatusType;
import lombok.Data;
+import java.util.ArrayList;
+
/**
* Created by vincent on 2020/8/7
*/
@@ -199,6 +201,16 @@
public Float yDuration;
public String errCrn;
+
+ 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;
this.modeType = CrnModeType.get(mode);
--
Gitblit v1.9.1