From a1ea92d773f2fc846651c0c31d18ccc9ed1a8fb2 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq,com>
Date: 星期三, 17 一月 2024 17:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdwcs' into mdqdwcs
---
src/main/java/com/zy/core/model/CrnSlave.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/CrnSlave.java b/src/main/java/com/zy/core/model/CrnSlave.java
index 70f7188..8af7e82 100644
--- a/src/main/java/com/zy/core/model/CrnSlave.java
+++ b/src/main/java/com/zy/core/model/CrnSlave.java
@@ -18,16 +18,26 @@
private Integer slot;
+ private Integer offset;
+
+ private Boolean demo;
+
// 鍫嗗灈鏈哄叆搴撶珯鐐�
private List<CrnStn> crnInStn = new ArrayList<>();
// 鍫嗗灈鏈哄嚭搴撶珯鐐�
private List<CrnStn> crnOutStn = new ArrayList<>();
+ // 绌烘墭鍏ュ簱绔欑偣
+ private List<CrnStn> emptyCrnInStn = new ArrayList<>();
+
+ // 绌烘墭鍑哄簱绔欑偣
+ private List<CrnStn> emptyCrnOutStn = new ArrayList<>();
+
@Data
public static class CrnStn {
- // 鍫嗗灈鏈簆lc缂栧彿
+ // 杈撻�佺嚎plc缂栧彿
private Integer devpPlcId;
// 鍫嗗灈鏈虹珯鐐圭紪鍙�
--
Gitblit v1.9.1