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

Junjie

2023-10-12 99a8838287cc16cc510899bc1ae82dee80d63cd9

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

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

    // erp上报
    private String erpReport;

}