From 1ebf83b7b8ae636f00d49406e4c9bbff2d73c34d Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 20 八月 2024 18:46:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 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 cd4eb1c..84e3376 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 @@ -45,11 +45,12 @@ return AjaxResult.success(); } @GetMapping("/getInfo") - @ApiOperation(tags = {"管理后台-活动管理"},value = "活动查看详情") + @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动查看详情") public AjaxResult<TActivity> getInfo(Integer id) { return AjaxResult.ok(activityService.getById(id)); } - @ApiOperation(tags = {"管理后台-活动管理"},value = "活动列表分页查询") + @ApiOperation(tags = {"管理后台-活动管理","小程序-个人中心-活动列表"},value = "活动列表分页查询") + @PostMapping(value = "/pageList") public AjaxResult<PageInfo<TActivity>> pageList(@RequestBody AdvertisingDTO dto) { return AjaxResult.ok(activityService.pageList(dto)); -- Gitblit v1.7.1