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

xiaoyong931011

2021-03-17 5041501b2eb692573e4f30e7cc4459149c117da6

 zq-erp/src/main/java/com/matrix/system/hive/service/ArticleService.java

@@ -72,6 +72,7 @@
    */
   public Article  findById(Long id);

   public List<Article> findApiArticleListInPage(Article article, PaginationVO pageVo);