From 402aba359adb4b10cfa98ad7fcb424eb55641129 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 七月 2024 15:54:52 +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/StudyInductionResultVO.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java
index 277b200..48ff009 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyInductionResultVO.java
@@ -1,6 +1,5 @@
package com.ruoyi.study.vo;
-import com.ruoyi.study.domain.TStudyInduction;
import com.ruoyi.study.domain.TSubject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -16,16 +15,16 @@
*/
@EqualsAndHashCode(callSuper = true)
@Data
-@ApiModel("归纳排除返回信息类")
+@ApiModel(value = "归纳排除返回信息类")
public class StudyInductionResultVO extends StudyModelVO {
/**
* 自主学习题目信息
*/
@ApiModelProperty("自主学习题目信息")
- private TStudyInduction data;
+ private LearnStudyVO data;
- public StudyInductionResultVO(TStudyInduction data, List<TSubject> subjectList) {
+ public StudyInductionResultVO(LearnStudyVO data, List<List<TSubject>> subjectList) {
this.data = data;
super.setSubjectList(subjectList);
}
--
Gitblit v1.7.1