From 1bea61102b935d0d5acd3a5ce8f441452a86ff4b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 28 五月 2024 14:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java
index 9624520..2186e9b 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/IArticleService.java
@@ -1,11 +1,11 @@
package com.ruoyi.article.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.article.domain.pojo.Article;
+import com.ruoyi.article.domain.Article;
import com.ruoyi.article.dto.ArticleDTO;
import com.ruoyi.article.vo.ArticleCommentsVO;
+import com.ruoyi.article.vo.ArticleVO;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.system.api.domain.MemberAddress;
/**
* <p>
@@ -17,7 +17,7 @@
*/
public interface IArticleService extends IService<Article> {
- PageDTO< Article> getArticleList(ArticleDTO articleDTO);
+ PageDTO<ArticleVO> getArticleList(ArticleDTO articleDTO);
PageDTO<Article> getMemberArticleList(ArticleDTO articleDTO);
@@ -25,7 +25,7 @@
void delMemberArticle(ArticleDTO articleDTO);
- Article getMemberArticleInfo(ArticleDTO articleDTO);
+ ArticleVO getMemberArticleInfo(ArticleDTO articleDTO);
PageDTO<ArticleCommentsVO> getArticleCommentsList(ArticleDTO articleDTO);
void getReport(ArticleDTO articleDTO);
--
Gitblit v1.7.1