From f4d3dd1e4964297648f1b7bb80470d70f1b8fcec Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 04 六月 2025 11:41:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java b/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
index 8d0be71..307070f 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/ActivityController.java
@@ -5,6 +5,7 @@
import cn.lili.group.Update;
import cn.lili.modules.lmk.domain.form.ActivityForm;
import cn.lili.modules.lmk.domain.form.CustomerBlackForm;
+import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.query.CustomerBlackQuery;
import cn.lili.modules.lmk.service.ActivityService;
@@ -63,7 +64,7 @@
return activityService.page(query);
}
- @GetMapping("/{idh }")
+ @GetMapping("/{id}")
@ApiOperation(value = "璇︽儏", notes = "璇︽儏")
public Result detail(@PathVariable("id") String id) {
return activityService.detail(id);
@@ -85,4 +86,12 @@
public Result activityChangeRecommend(@RequestBody ActivityForm form){
return activityService.activityChangeRecommend(form);
}
+
+ @GetMapping("/activityMembersPage")
+ @ApiOperation(value = "娲诲姩鎶ュ悕浜哄憳鍒嗛〉", notes = "娲诲姩鎶ュ悕浜哄憳鍒嗛〉")
+ public Result activityMembersPage(ActivityMembersQuery query){
+ return activityService.activityMembersPage(query);
+ }
+
+
}
--
Gitblit v1.8.0