Merge branch 'api' into order_reform

wzy

2021-01-13 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994

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

@@ -31,5 +31,7 @@
   public int  selectTotalRecord(@Param("record") Article article);
   
   public Article  selectById(Long id);
	

   public List<Article> selectApiArticleListInPage(@Param("record") Article article, @Param("pageVo") PaginationVO pageVo);

}