From bdf04af3958fb7a61f3180aa1efb795ba8ac00d2 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 08 九月 2025 15:28:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java
index ff0bac3..7db8886 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java
@@ -2,7 +2,9 @@
import cn.lili.base.Result;
import cn.lili.common.security.context.UserContext;
+import cn.lili.modules.lmk.domain.form.ActivityForm;
import cn.lili.modules.lmk.domain.form.ActivityReportForm;
+import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.service.ActivityService;
import cn.lili.modules.lmk.service.MyActivityService;
import io.swagger.annotations.Api;
@@ -24,8 +26,8 @@
@GetMapping()
@ApiOperation(value = "娲诲姩鍒楄〃", notes = "娲诲姩鍒楄〃")
- public Result getAllActivity(){
- return activityService.all();
+ public Result getAllActivity(ActivityQuery query){
+ return activityService.getCanReportPage(query);
}
@PostMapping()
@@ -40,4 +42,6 @@
public Result getActivityDetail(@PathVariable String activityId){
return myActivityService.detailByUsr(activityId);
}
+
+
}
--
Gitblit v1.8.0