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

zc

2024-09-13 ec8120682339a7b9feb64748320781e99fa0cb77

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

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

    // erp上报
    private String erpReport;

}