Merge remote-tracking branch 'origin/master'

linwe

2023-11-25 8400a67289b214b83a20484410fff96d236c6d49

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

@@ -20,7 +20,7 @@
    * @param article
    * @return
    */
   List<ArticleVO> selectArticlePageByApp(IPage page, ArticleVO article);
   List<ArticleVO> selectArticlePageByApp(IPage page, @Param("article") ArticleVO article);

   /**
    * 查询资讯分页信息
@@ -54,5 +54,5 @@

   Boolean upcomment(String ids, String type);

   ArticleVO getArticleOne(Article article);
   ArticleVO getArticleOne(ArticleVO article);
}