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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/BoilerTaskOrderRespVO.java

@@ -417,4 +417,6 @@ public class BoilerTaskOrderRespVO {
 
     @Schema(description = "联系电话")
     private String deptPhone;
+
+    private String reportConclusion;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/pipetaskorder/vo/PipeTaskOrderRespVO.java

@@ -419,4 +419,6 @@ public class PipeTaskOrderRespVO {
 
     @Schema(description = "联系电话")
     private String deptPhone;
+
+    private String reportConclusion;
 }