Merge branch 'api' into order_reform

Helius

2021-01-11 854d9d55a86b7076abc4f526e90001bd806d324c

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

}