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

whycq

2023-10-18 bb5bb4094dfc9c4a691692d0275cb24bedbc732c

 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;