This commit is contained in:
cjw 2024-08-23 11:16:59 +08:00
parent a591953a38
commit 7e06a6b266
2 changed files with 6 additions and 6 deletions

View File

@ -40,8 +40,8 @@ public class ActivityController extends BaseController {
/** /**
* 查询活动列表 * 查询活动列表
*/ */
@SaCheckPermission("scale:activity:list") @SaCheckPermission("scale:activity:pagelist")
@GetMapping("/list") @GetMapping("/pageList")
public TableDataInfo<ActivityVo> list(ActivityBo bo, PageQuery pageQuery) { public TableDataInfo<ActivityVo> list(ActivityBo bo, PageQuery pageQuery) {
return activityService.queryPageList(bo, pageQuery); return activityService.queryPageList(bo, pageQuery);
} }

View File

@ -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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; 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.bo.ActivityEnterBo;
import org.dromara.scale.domain.vo.ActivityEnterVo;
import org.dromara.scale.domain.vo.ActivityVo; import org.dromara.scale.domain.vo.ActivityVo;
import org.dromara.scale.service.IActivityEnterService; import org.dromara.scale.service.IActivityEnterService;
import org.dromara.scale.service.IActivityService; import org.dromara.scale.service.IActivityService;
@ -46,11 +46,11 @@ public class WxActivityController extends BaseController {
} }
/** /**
* 查询活动报名列表 * 查询活动列表
*/ */
@GetMapping("/pageList") @GetMapping("/pageList")
public TableDataInfo<ActivityEnterVo> list(ActivityEnterBo bo, PageQuery pageQuery) { public TableDataInfo<ActivityVo> list(ActivityBo bo, PageQuery pageQuery) {
return activityEnterService.queryPageList(bo, pageQuery); return activityService.queryPageList(bo, pageQuery);
} }
/** /**