Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-06-11 dd6cab3f295e2e9f127313c1ea3dde09eccb2ce6

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