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

Junjie

2023-10-05 86729230fe82c9387898264cf21df9af4b2f0a2d

 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;