From 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 05 Feb 2021 14:06:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0

---
 zq-erp/src/main/java/com/matrix/system/hive/dao/ArticleDao.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/ArticleDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/ArticleDao.java
index 681ed4e..644d380 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/ArticleDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/ArticleDao.java
@@ -2,6 +2,7 @@
 
 import com.matrix.core.pojo.PaginationVO;
 import com.matrix.system.hive.bean.Article;
+import com.matrix.system.hive.bean.ArticleType;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
@@ -31,5 +32,7 @@
 	public int  selectTotalRecord(@Param("record") Article article);
 	
 	public Article  selectById(Long id);
-	
+
+	public List<Article> selectApiArticleListInPage(@Param("record") Article article, @Param("pageVo") PaginationVO pageVo);
+
 }
\ No newline at end of file

--
Gitblit v1.9.1