Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs

luxiaotao1123

2023-02-02 5e966ab720ffff2bd0fe55ffda7263606923732d

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

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

    // erp上报
    private String erpReport;

}