Merge branch 'master' of

http://git.qmth.com.cn/ExamCloud-3/examcloud-core-oe-student.git

Conflicts:
	examcloud-core-oe-student-dao/src/main/java/cn/com/qmth/examcloud/core/oe/student/dao/entity/ExamRecordDataEntity.java

examcloud-core-oe-student-dao/src/main/java/cn/com/qmth/examcloud/core/oe/student/dao/entity/ExamRecordDataEntity.java

@@ -464,7 +464,6 @@ public class ExamRecordDataEntity extends JpaEntity {
         isIllegality = illegality;
     }
 
-    
     public SyncStatus getSyncStatus() {
         return syncStatus;
     }