Merge branch 'master' into online1

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

@@ -298,7 +298,7 @@
                 AND sv.num IS NULL
             </if>
             <if test="name != null">
-                AND (su.name_ LIKE CONCAT('%',#{name},'%') OR sr.parents_phone_ LIKE CONCAT('%',#{name},'%'))
+                AND (su.username_ LIKE CONCAT('%',#{name},'%') OR sr.parents_phone_ LIKE CONCAT('%',#{name},'%'))
             </if>
             <if test="currentGrade != null">
                 AND sr.current_grade_ LIKE CONCAT('%',#{currentGrade},'%')