Merge remote-tracking branch 'origin/develop_dl_3.7.0.9' into develop_dl_3.7.0.9

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1184,7 +1184,7 @@
 			DATE_FORMAT(ppk.end_time, '%Y-%m-%d %H:%i:%s') AS endTime,
 			ppk.point_num AS checkedNum,
 			ppk.finish_num AS finishedNum,
-			( CASE pptd.STATUS WHEN 0 THEN '未执行' WHEN 1 THEN '正常' WHEN 2 THEN '异常' WHEN 3 THEN '漏检' END ) AS execution,
+			( CASE pptd.STATUS WHEN 0 THEN '未执行' WHEN 1 THEN '合格' WHEN 2 THEN '不合格' WHEN 3 THEN '漏检' END ) AS execution,
 			ppk.user_id AS userId,
 			ppk.user_name AS executor
 		FROM