模拟考试题库

twzd-service/src/main/java/com/miaxis/question/service/impl/QuestionInfoServiceImpl.java

@@ -126,6 +126,7 @@ public class QuestionInfoServiceImpl extends ServiceImpl<QuestionInfoMapper, Que
             questionInfoTestDTO.setQuestionType(2);
             questionInfoTestDTO.setNum(60);
             List<QuestionInfo> list2 = questionInfoMapper.selectTestQuestionInfoList(questionInfoTestDTO);
+            list1.addAll(list2);
             return list1;
         } else if (questionInfoTestDTO.getSubject()==4) {
             questionInfoTestDTO.setQuestionType(1);