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

skyouc

2026-01-12 38242a15bc0a93933857018e7caf7c6ec41ee652

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

@@ -16,8 +16,17 @@
    // 托盘条码
    private String barcode;

    //站点
    private String station;

    // 库位编号
    private String locNo;
    //唯一编码
    private String bsCode;

    private String carBarcode;

    private String type;

    private List<CombMat> combMats;