fix bug

themis-business/src/main/java/com/qmth/themis/business/dao/TOeExamRecordMapper.java

@@ -253,9 +253,6 @@ public interface TOeExamRecordMapper extends BaseMapper<TOeExamRecord> {
 	public void updateObjectiveScore(@Param("recordId") Long recordId,@Param("score") Double score);
 
 	public TOeExamRecord findOneByPaperId(@Param("paperId")Long paperId);
-<<<<<<< HEAD
-	
-=======
 
     /**
      * 在线巡考报表接口
@@ -274,5 +271,4 @@ public interface TOeExamRecordMapper extends BaseMapper<TOeExamRecord> {
      * @return
      */
     public List<InvigilateListPatrolReportBean> examInvigilateReport(@Param("examId") Long examId, @Param("userId") Long userId);
->>>>>>> dev
 }