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

Junjie

2023-09-20 c8ec0494e03be47ec0f1b3a89ad5e0a004bd7501

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

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

    // erp上报
    private String erpReport;

}