Merge remote-tracking branch 'origin/dev_v3.3.0' into dev_v3.3.0

# Conflicts:
#	teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanBatchServiceImpl.java

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanBatchServiceImpl.java

@@ -168,7 +168,7 @@ public class ScanBatchServiceImpl extends ServiceImpl<ScanBatchMapper, ScanBatch
         // 更新批次统计数量
         updateAssignedCount(batch.getId());
         updateScanCount(batch.getId());
-        // 更新考生扫描状态
+        //直接更新考生扫描状态
         concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().lock();
         try {
             markStudentService.updateStudentAndPaper(user, student.getId(), studentPaperList);