Merge remote-tracking branch 'origin/dev' into dev

themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -156,7 +156,7 @@
 		resultType="com.qmth.themis.business.bean.backend.ExamViewCountListBean">
 		select t.exam_id examId,t.exam_activity_id examActivityId,t.room_code
 		roomCode,t.room_name roomName, count(1) examTotal from
-		t_e_exam_student t left join t_e_student f on t.student_id=f.id
+		t_e_exam_student t left join t_e_student h on t.student_id=h.id
 		where t.exam_id = #{examId}
 		<if test="orgId != null">
 		 	and h.org_id=#{orgId}