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

Administrator

8 天以前 f1fdbb9fbe3614e1b9b798e0219e17e8c520e0ce

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

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

    // erp上报
    private String erpReport;

}