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

18516761980

2022-06-21 f849fe0808bb3b38f60c24492d6d4595e9b7fa82

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

@@ -22,13 +22,13 @@
    public static class CombMat {

        // 物料编号
        private String matNo;
        private String matnr;

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

        // 物料数量
        private Double count;
        private Double anfme;

    }