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

zyx

2024-01-02 66c78586d3f2d9f854994bf7e7a9d5aed27d9c2f

 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;