From 1b679d0941f2e2b61b9c4b007aa8bc3b6e555e9c Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 28 十一月 2022 08:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 11 +++++++++++
1 files changed, 11 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..d90276f 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.SteSlave;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -19,7 +20,15 @@
@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<>();
+
+ private List<SteSlave> ste = new ArrayList<>();
private List<DevpSlave> devp = new ArrayList<>();
@@ -29,4 +38,6 @@
private List<Slave> scale = new ArrayList<>();
+ private List<Slave> car = new ArrayList<>();
+
}
--
Gitblit v1.9.1