From 57145eb45c9b339eecc97a5037c60c2f8da8f8fd Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 五月 2024 20:56:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyAnswerResultVO.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyAnswerResultVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyAnswerResultVO.java
index 1630385..11d1f78 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyAnswerResultVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyAnswerResultVO.java
@@ -1,11 +1,9 @@
package com.ruoyi.study.vo;
import com.ruoyi.study.domain.TStudyAnswer;
-import com.ruoyi.study.domain.TSubject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import java.util.List;
@@ -14,20 +12,17 @@
* @version 1.0
* @since 2024-05-22 14:48
*/
-@EqualsAndHashCode(callSuper = true)
@Data
-@ApiModel("有问有答返回信息类")
-public class StudyAnswerResultVO extends StudyModelVO {
+@ApiModel(value = "有问有答返回信息类")
+public class StudyAnswerResultVO{
/**
* 自主学习题目信息
*/
@ApiModelProperty("自主学习题目信息")
- private TStudyAnswer data;
+ private List<TStudyAnswer> data;
- public StudyAnswerResultVO(TStudyAnswer data, List<TSubject> subjectList) {
+ public StudyAnswerResultVO(List<TStudyAnswer> data) {
this.data = data;
- super.setSubjectList(subjectList);
}
-
}
--
Gitblit v1.7.1