Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/entity/request/warning/QueryWarningListRequest.java

 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "租户Id",hidden = true)
+    @ApiModelProperty(value = "租户Id", hidden = true)
     private Integer tenantId;
 
+
+    @ApiModelProperty(value = "对应任务的应急类型： 0：巡检任务应急记录 1：应急任务应急记录")
+    private Integer flag;
+
     @ApiModelProperty(value = "预警状态: 0:全部；1：待确认；2：确认；3：忽略；")
     private Integer status;
 }

tuoheng-admin/src/main/resources/mapper/WarningMapper.xml

         <where>
             <if test="1 == 1"> and mark = 1 </if>
             <if test="tenantId != null "> and tenant_id = #{tenantId} </if>
+            <if test="flag != null "> and flag = #{flag}</if>
             <if test="status != null and status != 0 "> and status = #{status}</if>
         </where>
         order by create_time desc