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

zjj

2024-11-03 4df965ceb66f05f9e13d849003821e8eaac76e1f

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

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

    // erp上报
    private String erpReport;

}