Merge branch 'maintenance_feature'

mec-biz/src/main/resources/config/mybatis/StudentInstrumentMapper.xml

@@ -146,7 +146,7 @@
             <if test="search != null">
                 AND (si.student_id_ = #{search} OR su.phone_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%'))
             </if>
-            AND del_flag_ = 0
+            AND si.del_flag_ = 0
         </where>
     </sql>