Merge remote-tracking branch 'origin/master'

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

@@ -656,7 +656,7 @@
 
     <select id="getStudentClassGroupWithTeacher" resultMap="com.ym.mec.biz.dal.dao.ClassGroupDao.ClassGroup">
         SELECT
-            cg.*
+            DISTINCT cg.*
         FROM
             class_group_student_mapper cgsm
             LEFT JOIN class_group_teacher_mapper cgtm ON cgsm.class_group_id_ = cgtm.class_group_id_