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/service/ITStudyService.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java
index 512b46c..ea1713a 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/service/ITStudyService.java
@@ -31,10 +31,9 @@
      *
      * @param userId 用户id
      * @param week   周目
-     * @param day    所属day
      * @return 学习信息
      */
-    TUserStudy studySchedule(String userId, Integer week, Integer day);
+    TUserStudy studySchedule(String userId, Integer week);
 
     /**
      * 自主学习1-听音选图
@@ -93,6 +92,6 @@
      * @param pair 音图相配
      * @return 题目信息
      */
-    StudyPairResultVO pictureMateVoice(Integer week, Integer day, TStudyPair pair);
+    StudyPairResultVO pictureMateVoice(Integer week, Integer day, List<TStudyPair> pair);
 
 }

--
Gitblit v1.7.1