From 8bae1dc75fbe2f45a72666a30d7899590b01da21 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 13 十一月 2020 16:51:16 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/properties/SlaveProperties.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java index ad23f6a..1cf0514 100644 --- a/src/main/java/com/zy/core/properties/SlaveProperties.java +++ b/src/main/java/com/zy/core/properties/SlaveProperties.java @@ -1,10 +1,14 @@ 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 lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.ArrayList; import java.util.List; /** @@ -15,14 +19,16 @@ @ConfigurationProperties(prefix = "wcs-slave") public class SlaveProperties { - private List<Slave> crn; + private List<CrnSlave> crn = new ArrayList<>(); - private List<Slave> devp; + private List<DevpSlave> devp = new ArrayList<>(); - private List<Slave> barcode; + private List<Slave> barcode = new ArrayList<>(); - private List<Slave> led; + private List<LedSlave> led = new ArrayList<>(); - private List<Slave> scale; + private List<Slave> scale = new ArrayList<>(); + + private List<Slave> car = new ArrayList<>(); } -- Gitblit v1.9.1