From 8d3177533e3cc19bc83bd1d2258783e44d082db2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 02 八月 2022 16:43:07 +0800
Subject: [PATCH] Merge branch 'gzynwcs' of http://47.97.1.152:5880/r/zy-wcs into gzynwcs
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 7 +++++++
1 files changed, 7 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..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,6 +14,11 @@
/**
* Created by vincent on 2020/8/4
+ *
+ */
+
+/**
+ * 璇ョ被鏁翠釜灏辨槸涓�涓�氳繃閰嶇疆鏂囦欢鏉ュ疄浣撳寲瀵硅薄绫�
*/
@Data
@Configuration
@@ -37,4 +43,5 @@
private List<Slave> car = new ArrayList<>();
+ private List<SocketSlave> socket = new ArrayList<>();
}
--
Gitblit v1.9.1