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

野心家

2023-10-10 f9fca9fa8b2a1d7d9abe18b10717cf62c5c8bcaf

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

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

    // erp上报
    private String erpReport;

}