Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

skyouc

5 天以前 9eec77f03187db772ac109345d980f8319676047

 src/main/java/com/zy/common/entity/Parameter.java

@@ -60,4 +60,7 @@
    // 打包下线
    private String packDown;

    // erp上报
    private String erpReport;

}