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

Junjie

2023-05-26 ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673

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

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

    // erp上报
    private String erpReport;

}