Merge remote-tracking branch 'origin/master'

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

@@ -368,7 +368,7 @@
     <sql id="queryMusicGroupStudentSql">
         <where>
             <if test="search != null and search != ''">
-                AND (su.username_ like CONCAT("%",#{search},"%") OR sr.parents_phone_ like CONCAT("%",#{search},"%"))
+                AND (su.username_ like CONCAT("%",#{search},"%") OR su.phone_ like CONCAT("%",#{search},"%"))
             </if>
             <if test="subjectId != null">
                 AND sr.actual_subject_id_ = #{subjectId}