Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs

zyx

2024-05-17 97e045fb1271016af2777580b980f974977909f3

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -16,6 +16,9 @@
    // 托盘条码
    private String barcode;

    // 托盘条码
    private Short containerType;

    // 库位编号
    private String locno;