合并代码，解决冲突

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExtractService.java

@@ -162,7 +162,7 @@ public class ExtractService {
                 List<QuesOptionDto> quesOptionDtos = BeanCopierUtil
                         .copyPropertiesOfList(subQuesList.get(m).getQuesOptions(), QuesOptionDto.class);
                 subQuesDtos.get(m).setQuesOptions(quesOptionDtos);
-                subQuesDtos.get(m).setQuesAnswer(DocxProcessUtil.getTextInHtml(subQuesList.get(m).getQuesAnswer()));
+                subQuesDtos.get(m).setQuesAnswer(subQuesList.get(m).getQuesAnswer());
                 subQuesDtos.get(m).setNumber(m + 1);
                 dto.setSubQuestions(subQuesDtos);
             }

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ImportPaperService.java

@@ -657,7 +657,7 @@ public class ImportPaperService {
                 }
             }
             // 选择题答案不持久化
-            question.setQuesAnswer(null);
+            //question.setQuesAnswer(null);
         }
     }
 
@@ -739,6 +739,7 @@ public class ImportPaperService {
                 }
                 subQuesList.add(subQues);
                 i = importPaperCheck.index - 1;
+                nestedQuesType = "";
             } else {
                 break;
             }