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

jyy

2021-01-25 4d4805096b898a6e99f31794facb81794bd1fcf7

 zq-erp/src/main/java/com/matrix/system/hive/dao/ArticleDao.java

@@ -32,4 +32,6 @@
   
   public Article  selectById(Long id);
   
   public List<Article> selectApiArticleListInPage(@Param("record") Article article, @Param("pageVo") PaginationVO pageVo);

}