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

18516761980

2022-06-15 edd30bf5081f3e267a8d21c1e60ee102a1a1acec

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

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

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

        // 物料数量