From 455e8885455fb73ad1c4755e86cab54d93223db2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 03 十二月 2022 10:50:55 +0800
Subject: [PATCH] Merge branch 'ynwcs' of http://47.97.1.152:5880/r/zy-wcs into ynwcs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 5 +++++
1 files changed, 5 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 4a60418..b40fca2 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;
@@ -25,8 +26,12 @@
private int groupCount;
+ private List<String> channel = new ArrayList<>();
+
private List<CrnSlave> crn = new ArrayList<>();
+ private List<SteSlave> ste = new ArrayList<>();
+
private List<DevpSlave> devp = new ArrayList<>();
private List<Slave> barcode = new ArrayList<>();
--
Gitblit v1.9.1