From 4026b1594d31cd40c7273e1cc3e121e8b4744bc0 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 25 八月 2020 15:01:16 +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 e691c45..5f5e393 100644 --- a/src/main/java/com/zy/core/properties/SlaveProperties.java +++ b/src/main/java/com/zy/core/properties/SlaveProperties.java @@ -1,6 +1,8 @@ package com.zy.core.properties; import com.zy.core.Slave; +import com.zy.core.model.CrnSlave; +import com.zy.core.model.DevpSlave; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -16,9 +18,9 @@ @ConfigurationProperties(prefix = "wcs-slave") public class SlaveProperties { - private List<Slave> crn = new ArrayList<>(); + private List<CrnSlave> crn = new ArrayList<>(); - private List<Slave> devp = new ArrayList<>(); + private List<DevpSlave> devp = new ArrayList<>(); private List<Slave> barcode = new ArrayList<>(); -- Gitblit v1.9.1