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

zc

2024-11-01 797fce4ad48f7b70dc08766068b64f35ee9d4775

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

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

    // erp上报
    private String erpReport;

}