Merge remote-tracking branch 'origin/ahyxwcs' into ahyxwcs

whycq

2024-09-26 19c4282ae9bad01293a7d4a4d5fe572fbc742c18

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -356,7 +356,7 @@
        if (result2.IsSuccess) {
            int[] staNosRgv = new int[]{281,292,173,214,120};
            if (slave.getId()==2){
                staNosRgv = new int[]{453,460,508,534,611};
                staNosRgv = new int[]{453,460,518,532,607};
            }
            for (int i = 0; i < barcodeSize; i++) {
                //1:281  2:292  3:174(173) 4:214  5:120