Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamSubjectSongMapper.xml

@@ -156,7 +156,7 @@
 		SELECT * FROM exam_subject_song WHERE examination_basic_id_=#{examId}
 	</select>
 
-    <select id="getExamSubjectSong" resultType="com.keao.edu.user.entity.ExamSubjectSong">
+    <select id="getExamSubjectSong" resultMap="ExamSubjectSong">
 		SELECT * FROM exam_subject_song WHERE examination_basic_id_=#{examinationBasicId} AND exam_subject_id_ = #{examSubjectId} AND level_ = #{level}
 	</select>