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

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

@@ -121,7 +121,7 @@
 
 	<select id="findExercisesSituations" resultMap="StudentExercisesSituationDto">
 		SELECT
-			MAX(id_) id_,
+			MAX(sees.id_) id_,
 			student_id_,
 			stu.username_ student_name_,
 			MAX(tea.real_name_) teacher_name_,