From b143fe586d7be6c12ec162bf5aebb3a99bff7e32 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 06 九月 2023 08:48:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index a6931f3..3bbce7f 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -4,6 +4,7 @@
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
+import com.zy.core.model.SocketSlave;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -13,11 +14,22 @@
/**
* Created by vincent on 2020/8/4
+ *
+ */
+
+/**
+ * 璇ョ被鏁翠釜灏辨槸涓�涓�氳繃閰嶇疆鏂囦欢鏉ュ疄浣撳寲瀵硅薄绫�
*/
@Data
@Configuration
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
+
+ private boolean doubleDeep;
+
+ private List<Integer> doubleLocs = new ArrayList<>();
+
+ private int groupCount;
private List<CrnSlave> crn = new ArrayList<>();
@@ -29,4 +41,7 @@
private List<Slave> scale = new ArrayList<>();
+ private List<Slave> car = new ArrayList<>();
+
+ private List<SocketSlave> socket = new ArrayList<>();
}
--
Gitblit v1.9.1