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

zjj

3 天以前 11e2b6d43b6c1664f74963649dad9507db34c6ae

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

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

    // erp上报
    private String erpReport;

}