From 50dfdaf4e3220e7c1f93a189879ea92bb8f46b4c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
index 18d04ba..f704b5c 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java
@@ -67,20 +67,32 @@
@RequiresPermissions(value = {"/activity/select"}, logical = Logical.OR)
@GetMapping("/getInfo")
- @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动查看详情")
+ @ApiOperation(tags = {"管理后台-活动管理"},value = "活动查看详情")
public AjaxResult<TActivity> getInfo(Integer id) {
return AjaxResult.ok(activityService.getById(id));
}
+ @GetMapping("/getInfo1")
+ @ApiOperation(tags = {"小程序-个人中心-活动列表"},value = "活动查看详情")
+ public AjaxResult<TActivity> getInfo1(Integer id) {
+ return AjaxResult.ok(activityService.getById(id));
+ }
- @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动列表分页查询")
-
-
+
+
+ @ApiOperation(tags = {"管理后台-活动管理"},value = "活动列表分页查询")
@RequiresPermissions(value = {"/activity/list"}, logical = Logical.OR)
@PostMapping(value = "/pageList")
public AjaxResult<PageInfo<TActivity>> pageList(@RequestBody AdvertisingDTO dto) {
return AjaxResult.ok(activityService.pageList(dto));
}
+
+
+ @ApiOperation(tags = {"小程序-个人中心-活动列表"},value = "活动列表分页查询")
+ @PostMapping(value = "/pageList1")
+ public AjaxResult<PageInfo<TActivity>> pageList1(@RequestBody AdvertisingDTO dto) {
+ return AjaxResult.ok(activityService.pageList(dto));
+ }
}
--
Gitblit v1.7.1