Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2024-07-09 126c774854a74f02e5deaee308a7688e0f171aaa

 src/main/java/com/ycl/jxkg/mapper/QuestionMapper.java

@@ -4,8 +4,8 @@
import com.ycl.jxkg.domain.entity.Question;
import com.ycl.jxkg.domain.other.KeyValue;
import com.ycl.jxkg.domain.question.RandomQuestionDTO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperImportVO;
import com.ycl.jxkg.domain.vo.admin.exam.QuestionExportVO;
import com.ycl.jxkg.domain.vo.admin.exam.QuestionImportVO;
import com.ycl.jxkg.domain.vo.admin.question.QuestionPageRequestVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -44,6 +44,6 @@
     */
    List<Question> getRandomQuestion(@Param("subjectId") Integer subjectId, @Param("questionType") Integer questionType,@Param("difficult") Integer difficult, @Param("num") Integer num);

    List<QuestionImportVO> export(@Param("query") QuestionExportVO query);
    List<ExamPaperImportVO> export(@Param("query") QuestionExportVO query);

}