From fe1801f4f3b9a3e2c9c0a7c1b004a9345be1b446 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 22 五月 2023 18:51:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/model/CrnSlave.java | 6 +++++-
1 files changed, 5 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..cfee50d 100644
--- a/src/main/java/com/zy/core/model/CrnSlave.java
+++ b/src/main/java/com/zy/core/model/CrnSlave.java
@@ -18,6 +18,10 @@
private Integer slot;
+ private Integer offset;
+
+ private Boolean demo;
+
// 鍫嗗灈鏈哄叆搴撶珯鐐�
private List<CrnStn> crnInStn = new ArrayList<>();
@@ -27,7 +31,7 @@
@Data
public static class CrnStn {
- // 鍫嗗灈鏈簆lc缂栧彿
+ // 杈撻�佺嚎plc缂栧彿
private Integer devpPlcId;
// 鍫嗗灈鏈虹珯鐐圭紪鍙�
--
Gitblit v1.9.1