Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

jyy

2021-04-20 d85af61932a03bd03663daf9da33177af5824a5c

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