diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityController.java index e95999b..765a44f 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/ActivityController.java @@ -40,8 +40,8 @@ public class ActivityController extends BaseController { /** * 查询活动列表 */ - @SaCheckPermission("scale:activity:list") - @GetMapping("/list") + @SaCheckPermission("scale:activity:pagelist") + @GetMapping("/pageList") public TableDataInfo list(ActivityBo bo, PageQuery pageQuery) { return activityService.queryPageList(bo, pageQuery); } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java index 0c0a724..6c2e28c 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxActivityController.java @@ -10,8 +10,8 @@ import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; +import org.dromara.scale.domain.bo.ActivityBo; import org.dromara.scale.domain.bo.ActivityEnterBo; -import org.dromara.scale.domain.vo.ActivityEnterVo; import org.dromara.scale.domain.vo.ActivityVo; import org.dromara.scale.service.IActivityEnterService; import org.dromara.scale.service.IActivityService; @@ -46,11 +46,11 @@ public class WxActivityController extends BaseController { } /** - * 查询活动报名列表 + * 查询活动列表 */ @GetMapping("/pageList") - public TableDataInfo list(ActivityEnterBo bo, PageQuery pageQuery) { - return activityEnterService.queryPageList(bo, pageQuery); + public TableDataInfo list(ActivityBo bo, PageQuery pageQuery) { + return activityService.queryPageList(bo, pageQuery); } /**