Merge branch 'wanjing' into develop

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

@@ -111,13 +111,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 根据云盒ID查询执行中的巡检任务-->
     <select id="getListByBox" resultType="com.tuoheng.admin.entity.Inspection">
-        select
         <include refid="selectInspectionVo"/>
-        from th_inspection i
-        where i.box_sn = #{boxSn,jdbcType=VARCHAR}
-        and i.status = 10
-        and i.mark = 1
-        order by i.update_time desc
+        where box_sn = #{boxSn, jdbcType=VARCHAR}
+        and status = 10
+        and mark = 1
+        order by update_time desc
     </select>
 
     <!-- 根据部门id列表查多条任务-->