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

Junjie

2023-12-25 84d74096a72578a83d9f3b48afa8c39b4ba0ae9a

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

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

    // erp上报
    private String erpReport;

}