Merge remote-tracking branch 'origin/master'

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/InspectionPointResultVo.java

@@ -36,4 +36,5 @@ public class InspectionPointResultVo {
     String alarmType;
     String content;
     String resultType;
+    String valid;
 }

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

@@ -983,6 +983,7 @@
         <result property="alarmLevel" column="alarm_level"/>
         <result property="alarmType" column="alarm_type"/>
         <result property="content" column="content"/>
+        <result property="vaild" column="vaild"/>
         <result property="resultType" column="result_type"/>
 
     </resultMap>
@@ -1004,7 +1005,8 @@
         pr.file_path base_file_path,
         pr.rectangle,
         ra.result_type,
-        ra.description       content
+        ra.description       content,
+        pr.valid valid
         FROM patrol_result pr
         LEFT JOIN result_analysis ra on pr.line_id = ra.business_id
         LEFT JOIN basedata_patrolpoint bp ON pr.device_id = bp.patrol_point_id