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

whycq

2023-09-26 49d91d5206cc9303294ad170cbb7344373d47c59

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

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

    // erp上报
    private String erpReport;

}