Merge branch '20220818' into master_saas

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

@@ -988,7 +988,7 @@
         <include refid="global.limit" />
     </select>
     
-    <select id="queryStudentExerciseMusicGroupListCount" resultType="int">
+    <select id="queryStudentExerciseMusicGroupListCount" resultType="java.lang.Integer">
     	SELECT count(sees.music_group_id_) from student_extracurricular_exercises_situation_ sees 
 		LEFT JOIN music_group mg on mg.id_ = sees.music_group_id_
 		WHERE sees.teacher_id_ = #{teacherId} and sees.serve_type_ = 'EXERCISE' and sees.actual_exercises_num_ = 0