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

LSH

2022-10-31 ea77ba7aab1402fea6e68c9be172bf43a007d675

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

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

    // erp上报
    private String erpReport;

}