Merge remote-tracking branch 'origin/master'

zengh

2022-01-06 d536920d3a707c85031047a8732dabf21ad87743

 src/main/java/org/springblade/modules/article/mapper/ArticleMapper.java

@@ -30,6 +30,8 @@
    */
   List<Article> pageDate(IPage<Article> page, @Param("article") ArticleVo article);

   List<Article> pageWords(IPage<Article> page, @Param("article") ArticleVo article);

   List<Article> pageCollectList(IPage<Article> page, @Param("article") ArticleVo article);

   /**