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

zc

2024-09-10 cf0d53897a95e09a34afb1c6dee05ac8993c204f

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

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

    // erp上报
    private String erpReport;

}