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

luxiaotao1123

2021-08-26 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e

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

@@ -14,10 +14,10 @@

    public static class CombMat {

        // 物料编号
        // 产品编号
        private String matNo;

        // 物料数量
        // 产品数量
        private Double count;

        public String getMatNo() {