Merge branch 'dev'

1

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

@@ -187,7 +187,7 @@
 		</if>
         ) t,
         (SELECT @i := 0) as i
-		order by t.roomCode
+		order by t.warningNew desc
 	</select>
 
 	<select id="invigilatePageListVideo" resultType="com.qmth.themis.business.bean.backend.InvigilateListVideoBean">
@@ -210,7 +210,7 @@
 		</if>
 		) t,
 		(SELECT @i := 0) as i
-		order by t.roomCode
+		order by t.warningNew desc
 	</select>
 
 	<select id="invigilatePageListVideoRandom" resultType="com.qmth.themis.business.bean.backend.InvigilateListVideoBean">