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

xiaoyong931011

2021-04-08 d6e902a48df4264d6dbf6ff0c9799c3c30c9d9ff

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