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

zjj

2024-11-09 728ae1ba12ed4f59fa4dd897b74dd55b415856e5

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

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

    // erp上报
    private String erpReport;

}