From 4318746ee88ad53e00341df1a0395058bebc40fa Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 25 六月 2025 14:33:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/ActivityReportController.java | 5 +++--
1 files changed, 3 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..78d6903 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
@@ -3,6 +3,7 @@
import cn.lili.base.Result;
import cn.lili.common.security.context.UserContext;
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 +25,8 @@
@GetMapping()
@ApiOperation(value = "娲诲姩鍒楄〃", notes = "娲诲姩鍒楄〃")
- public Result getAllActivity(){
- return activityService.all();
+ public Result getAllActivity(ActivityQuery query){
+ return activityService.getCanReportPage(query);
}
@PostMapping()
--
Gitblit v1.8.0