Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -91,7 +91,7 @@
     </select>
 
     <select id="getPageList" resultMap="StudentVisit">
-        SELECT sv.*,t.real_name_ teacherName,o.name_ organName,t.username_ studentName,mg.name_ musicGroupName FROM
+        SELECT sv.*,t.real_name_ teacherName,o.name_ organName,s.username_ studentName,mg.name_ musicGroupName FROM
         student_visit sv
         LEFT JOIN sys_user t ON sv.teacher_id_ = t.id_
         LEFT JOIN organization o ON sv.organ_id_ = o.id_