Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-publicSecurity

zengh

2021-06-11 02fe295ee1dc726717cc005de584d0ebd05d8e92

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/article/mapper/ArticleMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.jfpt.article.entity.Article;
import org.springblade.jfpt.article.vo.ArticleVo;

import java.util.List;

@@ -19,5 +20,5 @@
    * @param article 资讯对象
    * @return
    */
   List<Article> selectArticlePage(IPage<Article> page, Article article);
   List<Article> selectArticlePage(IPage<Article> page, ArticleVo article);
}