From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/domain/vo/SubjectQuestionVO.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/domain/vo/SubjectQuestionVO.java b/src/main/java/com/mindskip/xzs/domain/vo/SubjectQuestionVO.java
index a7b7936..0674ebe 100644
--- a/src/main/java/com/mindskip/xzs/domain/vo/SubjectQuestionVO.java
+++ b/src/main/java/com/mindskip/xzs/domain/vo/SubjectQuestionVO.java
@@ -1,5 +1,6 @@
package com.mindskip.xzs.domain.vo;
+import com.mindskip.xzs.domain.PracticeQuestionCondition;
import lombok.Data;
import java.util.List;
@@ -15,17 +16,10 @@
private String subjectName;
- private List<Integer> questionIds;
+ /** 鍒烽妯″紡涓嬬殑棰樺垪琛� */
+ private List<PracticeQuestionCondition.QuestionFinishCondition> questionConditions;
-
- @Data
- public static class QuestionPractice {
-
- private Integer questionId;
-
- /** 鏄惁鍋氳繃锛�0娌℃湁 1鍋氫簡 */
- private Integer doIt;
-
- }
+ /** 鐪嬮妯″紡涓嬬殑棰樺垪琛� */
+ private List<QuestionVO> lookQuestionList;
}
--
Gitblit v1.8.0