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

zc

2024-09-05 9efa273533be66131806ea52b479dacc320d9c43

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

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

    // erp上报
    private String erpReport;

}