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

野心家

2023-08-11 b0f1c7464b31e70e227e01ae7d36e20262215ace

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

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

    // erp上报
    private String erpReport;

}