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/StudyPairResultVO.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairResultVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairResultVO.java
index a1abae0..8a21334 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairResultVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairResultVO.java
@@ -1,11 +1,9 @@
package com.ruoyi.study.vo;
-import com.ruoyi.study.domain.TStudyPair;
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,18 +12,17 @@
* @version 1.0
* @since 2024-05-22 14:48
*/
-@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel(value = "音图相配返回信息类")
-public class StudyPairResultVO extends StudyModelVO {
+public class StudyPairResultVO extends StudyModelVO {
/**
* 自主学习题目信息
*/
@ApiModelProperty("自主学习题目信息")
- private TStudyPair data;
+ private LearnStudyVO data;
- public StudyPairResultVO(TStudyPair data, List<TSubject> subjectList) {
+ public StudyPairResultVO(LearnStudyVO data, List<List<TSubject>> subjectList) {
this.data = data;
super.setSubjectList(subjectList);
}
--
Gitblit v1.7.1