From 80b5033b8d5b918c7ca2523bc2a69139c2bab438 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 15 六月 2024 19:21:33 +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/StudyStoryListenResultVO.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyStoryListenResultVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyStoryListenResultVO.java
index 582cab2..0b8f12b 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyStoryListenResultVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyStoryListenResultVO.java
@@ -1,11 +1,10 @@
package com.ruoyi.study.vo;
+import com.ruoyi.study.domain.TStory;
import com.ruoyi.study.domain.TStoryListen;
-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,10 +13,9 @@
* @version 1.0
* @since 2024-05-22 14:39
*/
-@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel(value = "自主故事-看图配音&&框架记忆返回信息类")
-public class StudyStoryListenResultVO extends StudyModelVO {
+public class StudyStoryListenResultVO {
/**
* 自主故事-看图配音&&框架记忆题目信息
@@ -25,8 +23,14 @@
@ApiModelProperty("自主故事-看图配音&&框架记忆题目信息")
private TStoryListen data;
- public StudyStoryListenResultVO(TStoryListen data, List<TSubject> subjectList) {
+ /**
+ * 自主学习题目所包含录音图片等
+ */
+ @ApiModelProperty("故事列表")
+ private List<TStory> storyList;
+
+ public StudyStoryListenResultVO(TStoryListen data, List<TStory> storyList) {
this.data = data;
- super.setSubjectList(subjectList);
+ this.storyList = storyList;
}
}
--
Gitblit v1.7.1