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

zjj

4 天以前 78dde5ad6acc2a49fd08472afb61a1504ea791d9

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

@@ -40,6 +40,12 @@
        // 规格
        private String specs;

        private String supp;

        private String temp1;

        private String temp2;

    }

}