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

Junjie

2023-10-07 dca05a46447295fb484445c910a967fb2b107bc6

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

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

    // erp上报
    private String erpReport;

}