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

18516761980

2021-08-25 85a699187b5eea57f93c42c23893a504383a5e5a

 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() {