Merge branch 'rcs_master' into jdxaj

zhang

4 天以前 91917e48f87be1cecdb9e1235ff5a8678f50ec6d

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

@@ -27,6 +27,8 @@

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

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

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

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