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

mrzhssss

2022-12-14 2b7ac35fd8abeaec8dcda8ed731ed8007e9e08d4

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

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

    // erp上报
    private String erpReport;

}