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

Junjie

2024-11-22 bb748f7f3dc15af31953a20200b1564fb77bfd7a

 src/main/java/com/zy/asrs/controller/ConsoleController.java

@@ -321,6 +321,7 @@
            BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, slave.getId());
            map.put("id", slave.getId());
            map.put("barcode", barcodeThread.getBarcode());
            list.add(map);
        }
        return R.ok().add(list);
    }