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/impl/ArticleServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
index b4b78ca..376f07f 100644
--- a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -38,6 +38,12 @@
 	public IPage<Article> pageDate(IPage<Article> page, ArticleVo article) {
 		return page.setRecords(baseMapper.pageDate(page,article));
 	}
+
+	@Override
+	public IPage<Article> pageCollectList(IPage<Article> page, ArticleVo article) {
+		return page.setRecords(baseMapper.pageCollectList(page,article));
+	}
+
 	/**
 	 * 查询资讯分页信息(角色权限)附带评论点赞数
 	 * @param page
@@ -49,6 +55,11 @@
 		return page.setRecords(baseMapper.pageLikes(page,article));
 	}
 
+	@Override
+	public IPage<Article> pageCollect(IPage<Article> page, ArticleVo article) {
+		return page.setRecords(baseMapper.pageCollect(page,article));
+	}
+
 	/**
 	 * 批量更新
 	 * @return

--
Gitblit v1.9.3