Merge remote-tracking branch 'origin/hive2.0' into hive2.0

935090232@qq.com

2021-02-20 5f377d1f45b85fba841794a93e67b03622613479

 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);
   }
}