Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java

@@ -38,6 +38,12 @@
   public IPage<Article> pageDate(IPage<Article> page, ArticleVo article) {
      return page.setRecords(baseMapper.pageDate(page,article));
   }

   @Override
   public IPage<Article> pageCollectList(IPage<Article> page, ArticleVo article) {
      return page.setRecords(baseMapper.pageCollectList(page,article));
   }

   /**
    * 查询资讯分页信息(角色权限)附带评论点赞数
    * @param page
@@ -49,6 +55,11 @@
      return page.setRecords(baseMapper.pageLikes(page,article));
   }

   @Override
   public IPage<Article> pageCollect(IPage<Article> page, ArticleVo article) {
      return page.setRecords(baseMapper.pageCollect(page,article));
   }

   /**
    * 批量更新
    * @return