From 8ba4ddfed043b20b0a15316141a9be10162ba664 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期一, 12 十二月 2022 12:17:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfwcs_tqs' into bfwcs_tqs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java
index e691c45..d90276f 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -1,6 +1,10 @@
package com.zy.core.properties;
import com.zy.core.Slave;
+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;
@@ -16,14 +20,24 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
- private List<Slave> crn = new ArrayList<>();
+ private boolean doubleDeep;
- private List<Slave> devp = new ArrayList<>();
+ 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<>();
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