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

TQS

2022-11-29 b86aa6bb86bd9346f559e2c521360001ee582ce6

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

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

    // erp上报
    private String erpReport;

}