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

Junjie

2023-10-16 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34

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

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

    // erp上报
    private String erpReport;

}