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

TQS

2022-12-03 7e5e4b43f4bcd7248325e1e1a5f10c61d64e93d3

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

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

    // erp上报
    private String erpReport;

}