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

# Conflicts:
#	yudao-ui-admin-vue3/src/views/pressure2/boilerReportCheck/index.vue
#	yudao-ui-admin-vue3/src/views/pressure2/boilerReportRatify/index.vue
#	yudao-ui-admin-vue3/src/views/pressure2/pipeReportCheck/index.vue

yudao-ui-admin-vue3/src/views/pressure2/pipeReportRatify/index.vue

@@ -286,10 +286,10 @@ const resetQuery = () => {
 }
 
 const handleEdit = (row: Record<string, any>) => {
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id: row.orderId || row.id, type: 'reportRatify' } })
+  router.push({ name: 'ReportRatifyPipe', query: { id: row.orderId || row.id, type: 'reportRatify' } })
 }
 const handleRowDblclick = (row: Record<string, any>) => {
-  router.push({ name: 'PipeCheckerTaskDetail', query: { id: row.orderId || row.id, type: 'reportRatify' } })
+  router.push({ name: 'ReportRatifyPipe', query: { id: row.orderId || row.id, type: 'reportRatify' } })
 }
 
 //------------人员选择弹窗------------------------