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

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -3915,7 +3915,8 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         BoilerTaskOrderItemReportDO taskOrderItemReportDO = new BoilerTaskOrderItemReportDO();
         taskOrderItemReportDO.setId(taskOrderAuditSingleVO.getId());
         taskOrderItemReportDO.setAuditor(userId);
-        taskOrderItemReportDO.setRecheckId(null); //拒绝后去掉校核人
+        taskOrderItemReportDO.setRecheckId(""); //拒绝后去掉校核人
+        taskOrderItemReportDO.setRecheckName("");
         taskOrderItemReportDO.setRecheckDate(now());
         taskOrderItemReportDO.setRecheckStatus(300);
         taskOrderItemReportDO.setRecheckReason(taskOrderAuditSingleVO.getReason());

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -3074,6 +3074,8 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         PipeTaskOrderItemReportDO taskOrderItemReportDO = new PipeTaskOrderItemReportDO();
         taskOrderItemReportDO.setId(taskOrderAuditSingleVO.getId());
         taskOrderItemReportDO.setAuditor(userId);
+        taskOrderItemReportDO.setRecheckId(""); //拒绝后去掉校核人
+        taskOrderItemReportDO.setRecheckName("");
         taskOrderItemReportDO.setRecheckDate(now());
         taskOrderItemReportDO.setRecheckStatus(300);
         taskOrderItemReportDO.setRecheckReason(taskOrderAuditSingleVO.getReason());

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/application-hsd.yaml

@@ -162,9 +162,9 @@ tz:
         key: 'bowin_jwt-secret'
         header: ''
         tokenValidityInMinutes: 120
-    qrCodeWebUrl:
-      pipe: 'http://192.168.0.53/pressure2/qr-report/pipe?id=%s'
-      boiler: 'http://192.168.0.53/pressure2/qr-report/boiler?id=%s'
+  qrCodeWebUrl:
+    pipe: 'http://192.168.0.53/pressure2/qr-report/pipe?id=%s'
+    boiler: 'http://192.168.0.53/pressure2/qr-report/boiler?id=%s'
 
 feign:
   client: