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

whycq

2022-08-06 f41349d180a4c42a3a127c9fbd102fe4603890fb

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

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

    // erp上报
    private String erpReport;

}