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

TQS

2023-03-14 29d91b9ec32a8fff36c60938c4d87f7ee5495497

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

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

    // erp上报
    private String erpReport;

}