From 610604ea8fbdc1f2b0f54e90a689b9ff449f092c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 六月 2024 15:48:04 +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/StudyLookResultVO.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyLookResultVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyLookResultVO.java
index 3af3b8a..6332626 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyLookResultVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyLookResultVO.java
@@ -1,6 +1,5 @@
package com.ruoyi.study.vo;
-import com.ruoyi.study.domain.TStudyLook;
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("看图选音返回信息类")
-public class StudyLookResultVO extends StudyModelVO{
+@ApiModel(value = "看图选音返回信息类")
+public class StudyLookResultVO extends StudyModelVO {
/**
* 自主学习题目信息
*/
@ApiModelProperty("自主学习题目信息")
- private TStudyLook data;
+ private LearnStudyVO data;
- public StudyLookResultVO(TStudyLook data, List<TSubject> subjectList) {
+ public StudyLookResultVO(LearnStudyVO data, List<List<TSubject>> subjectList) {
this.data = data;
super.setSubjectList(subjectList);
}
--
Gitblit v1.7.1