Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 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> pageCollectList(IPage<Article> page, @Param("article") ArticleVo article);

   /**
    * 查询资讯分页信息(角色权限)附带评论点赞数量
    * @param page
@@ -38,5 +40,7 @@
    */
   List<Article> pageLikes(IPage<Article> page, @Param("article") ArticleVo article);

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

   Boolean upcomment(String ids,String type);
}