Merge branch 'rcs_master' into jdxaj

zhang

6 天以前 91917e48f87be1cecdb9e1235ff5a8678f50ec6d

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/properties/SlaveProperties.java

@@ -1,6 +1,5 @@
package com.zy.acs.conveyor.core.properties;

import com.zy.acs.conveyor.core.Slave;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
@@ -20,15 +19,8 @@
@ConfigurationProperties(prefix = "cv-slave")
public class SlaveProperties {

    private boolean doubleDeep;

    private List<Integer> doubleLocs = new ArrayList<>();

    private int groupCount;

    private List<DevpSlave> devp = new ArrayList<>();

    private List<Slave> barcode = new ArrayList<>();


}