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

Junjie

2023-03-20 7bea8428d74527993cb4ae47d01c79850b5f34bc

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

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

    // erp上报
    private String erpReport;

}