From 3e85a137adb035e4808e95edf7017f7f204900d9 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 22 May 2021 09:32:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/ArticleServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ArticleServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ArticleServiceImpl.java
index 2749a58..f42702b 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ArticleServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/ArticleServiceImpl.java
@@ -117,7 +117,8 @@
 	
 	}
 
-   	
-	
-	
+	@Override
+	public List<Article> findApiArticleListInPage(Article article, PaginationVO pageVo) {
+		return articleDao.selectApiArticleListInPage(article, pageVo);
+	}
 }
\ No newline at end of file

--
Gitblit v1.9.1