From 90db1f77f09c717ce9f1f810139c43c0f88aee67 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 28 十一月 2022 11:44:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylywcs' into hylywcs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index 5f5e393..b2e19a4 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -3,6 +3,7 @@
import com.zy.core.Slave;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.LedSlave;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -12,11 +13,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<>();
@@ -24,8 +36,10 @@
private List<Slave> barcode = new ArrayList<>();
- private List<Slave> led = new ArrayList<>();
+ private List<LedSlave> led = new ArrayList<>();
private List<Slave> scale = new ArrayList<>();
+ private List<Slave> car = new ArrayList<>();
+
}
--
Gitblit v1.9.1