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

zjj

3 天以前 11e2b6d43b6c1664f74963649dad9507db34c6ae

 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;

    }

}