From eafdcd8632c8b2721972a49ac0bccd040c75b52d Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 08 九月 2020 14:59:15 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/properties/SlaveProperties.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java index a03469f..a6931f3 100644 --- a/src/main/java/com/zy/core/properties/SlaveProperties.java +++ b/src/main/java/com/zy/core/properties/SlaveProperties.java @@ -1,7 +1,9 @@ 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; @@ -17,13 +19,13 @@ @ConfigurationProperties(prefix = "wcs-slave") public class SlaveProperties { - private List<Slave> crn = new ArrayList<>(); + private List<CrnSlave> crn = 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<>(); -- Gitblit v1.9.1