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

Junjie

2023-05-26 5f796b6d898663704ca72b7fed9de0ad243af4b6

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

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

    // erp上报
    private String erpReport;

}