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

zjj

2024-11-08 b6a095a76848ffd15922cc4af7f14594fc5bf85d

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

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

    // erp上报
    private String erpReport;

}