From ccbfaf4700422eda488f5807ee9a0f3ce3a94b2c Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期三, 23 四月 2025 17:26:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/UserCollectService.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/UserCollectService.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/UserCollectService.java index 97d4a7a..72be1ee 100644 --- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/UserCollectService.java +++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/service/UserCollectService.java @@ -1,10 +1,10 @@ package com.ruoyi.user.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.user.entity.UserCollect; import com.ruoyi.user.vo.UserCollectVO; - -import java.util.List; /** * <p> @@ -20,7 +20,8 @@ * 服务收藏列表 * * @param userid 用户id + * @param page 分页 * @return 服务列表 */ - List<UserCollectVO> collectList(Long userid); + IPage<UserCollectVO> collectList(Integer userid, Page<UserCollectVO> page); } -- Gitblit v1.7.1