Merge remote-tracking branch 'refs/remotes/origin/stasrs' into stasrs

Junjie

2023-03-14 163bdd3a71de83b9e36340be3fe6380b6758e4fd

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

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

    // erp上报
    private String erpReport;

}