Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-27 1b16865afc26b5ae7d2618237c76ea6b99931d8f

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

@@ -24,7 +24,7 @@
        // 物料编号
        private String matnr;

        // 批号
        // 序列码
        private String batch;

        // 物料数量