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

czkh

2 天以前 975823f4d07c91a67162f553be9ff4ac25f3d47d

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

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

    // erp上报
    private String erpReport;

}