Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/resources/mapper/ReportMapper.xml

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="request.tenantId != null and request.tenantId != ''"> and tenant_id = #{request.tenantId} </if>
             <if test="request.inspectionCode!= null and request.inspectionCode != ''"> and inspection_code like concat('%', #{request.inspectionCode}, '%') </if>
             <if test="request.airportId != null and request.airportId != 0"> and airport_id = #{request.airportId} </if>
-            <if test="request.type != null and (request.type == 0 or request.type == 1)"> and type = #{request.type} </if>
+            <if test="request.type != null and (request.type == 0 or request.type == 1 or request.type == 2)"> and type = #{request.type} </if>
             <if test="request.deptIdList != null and request.deptIdList.size() > 0">
                 and dept_id in
                 <foreach item="deptId" collection="request.deptIdList" open="(" separator="," close=")">