Merge remote-tracking branch 'origin/master'

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

@@ -108,9 +108,9 @@
             vgc.name_ vip_group_category_
         FROM
             class_group_student_mapper cgsm
-            LEFT JOIN vip_group vg ON vgcgm.vip_group_id_=vg.id_
+            LEFT JOIN vip_group vg ON cgsm.music_group_id_=vg.id_
             LEFT JOIN vip_group_category vgc ON vg.vip_group_category_id_=vgc.id_
-        WHERE cgsm.music_group_id_=vg.id_ AND cgsm.user_id_=#{userId}
+        WHERE cgsm.music_group_id_=vg.id_ AND cgsm.user_id_=#{userId} AND cgsm.group_type_ = 'VIP'
     </select>
 
     <!-- 全查询 -->