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

LSH

2023-12-26 01468f977925eb5926b843fd0cd74fee42bdc9a7

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

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

    // erp上报
    private String erpReport;

}