Merge remote-tracking branch 'origin/master'

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

@@ -830,6 +830,7 @@
         <if test="search != null and search != ''">
             AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
         </if>
+        AND su.del_flag_ = 0
         GROUP BY su.id_
     </select>
     <select id="queryTeacherImModel" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.ImUserModel">