From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/article/service/ArticleService.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/service/ArticleService.java b/src/main/java/org/springblade/modules/article/service/ArticleService.java
index fcba994..55bce36 100644
--- a/src/main/java/org/springblade/modules/article/service/ArticleService.java
+++ b/src/main/java/org/springblade/modules/article/service/ArticleService.java
@@ -27,6 +27,8 @@
 	 */
 	IPage<Article> pageDate(IPage<Article> page, ArticleVo article);
 
+	IPage<Article> pageCollectList(IPage<Article> page, ArticleVo article);
+
 	/**
 	 * 查询资讯分页信息(角色权限)附带评论点赞数
 	 * @param page
@@ -35,5 +37,13 @@
 	 */
 	IPage<Article> pageLikes(IPage<Article> page, ArticleVo article);
 
+	/**
+	 * 查看已收藏的资讯
+	 * @param page
+	 * @param article 资讯对象
+	 * @return
+	 */
+	IPage<Article> pageCollect(IPage<Article> page, ArticleVo article);
+
 	Boolean upcomment(String ids,String type);
 }

--
Gitblit v1.9.3