From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java
index d1bc172..00b403b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/ActivityService.java
@@ -5,6 +5,7 @@
 import com.doumee.dao.business.model.Activity;
 import com.doumee.dao.web.dto.activity.*;
 import com.doumee.dao.web.request.ActivityPageListRequest;
+import com.doumee.dao.web.request.goods.ArticleRequest;
 
 import java.util.List;
 
@@ -184,4 +185,11 @@
     PageData<ActivityCardDTO> getUserFollowActivityCard(PageWrap pageWrap,Integer memberId);
 
     void updateLooknum(Activity model);
+
+
+    PageData<Activity> getArticlePage(PageWrap<ArticleRequest> pageWrap);
+
+    Activity getArticleInfo(Integer id, Integer memberId);
+
+
 }

--
Gitblit v1.9.3