Merge remote-tracking branch 'origin/saas' into saas

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

@@ -1036,7 +1036,7 @@
         LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
         LEFT JOIN class_group_student_mapper cgsm ON cgsm.class_group_id_ = cg.id_
         WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.group_type_ = 'MUSIC' AND cgsm.user_id_ = #{userId}
-        GROUP BY mg.id_,mgsf.payment_status_
+        GROUP BY mg.id_
     </select>
 
     <select id="queryStudentPracticeCourses" resultMap="CourseListDto">