Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1

Junjie

2023-12-21 89034b8a149e156703bbc8c49671d747cf2298a2

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

@@ -24,6 +24,15 @@
    @Data
    public static class CombMat {

        //料想码
        private String containerCode;

        //销售订单号
        private String csocode;

        //销售订单行号
        private String isoseq;

        // 物料编号
        private String matnr;