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

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

@@ -544,7 +544,7 @@
                 SELECT user_id_ FROM course_schedule_student_payment cssp
                 LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_
                 WHERE cssp.user_id_=su.id_ AND cs.teach_mode_='ONLINE'
-                AND NOT EXISTS(SELECT student_id_ FROM practice_group WHERE cssp.music_group_id_=id_ AND cssp.group_type_='PRACTICE' AND type_!='TRIAL')
+                AND NOT EXISTS(SELECT student_id_ FROM practice_group WHERE cssp.music_group_id_=id_ AND cssp.group_type_='PRACTICE' AND type_='TRIAL')
                 AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
             )
         ORDER BY su.id_
@@ -574,7 +574,7 @@
                 SELECT user_id_ FROM course_schedule_student_payment cssp
                 LEFT JOIN course_schedule cs ON cs.id_=cssp.course_schedule_id_
                 WHERE cssp.user_id_=su.id_ AND cs.teach_mode_='ONLINE'
-                AND NOT EXISTS(SELECT student_id_ FROM practice_group WHERE cssp.music_group_id_=id_ AND cssp.group_type_='PRACTICE' AND type_!='TRIAL')
+                AND NOT EXISTS(SELECT student_id_ FROM practice_group WHERE cssp.music_group_id_=id_ AND cssp.group_type_='PRACTICE' AND type_='TRIAL')
                 AND CONCAT(cs.class_date_, ' ', cs.start_class_time_) > NOW()
             )
     </select>