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

Junjie

2023-05-24 4c98ecfe56a77a17352d01163b9b86fa98f0f2a9

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

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

    // erp上报
    private String erpReport;

}