This commit is contained in:
parent
a591953a38
commit
7e06a6b266
|
@ -40,8 +40,8 @@ public class ActivityController extends BaseController {
|
|||
/**
|
||||
* 查询活动列表
|
||||
*/
|
||||
@SaCheckPermission("scale:activity:list")
|
||||
@GetMapping("/list")
|
||||
@SaCheckPermission("scale:activity:pagelist")
|
||||
@GetMapping("/pageList")
|
||||
public TableDataInfo<ActivityVo> list(ActivityBo bo, PageQuery pageQuery) {
|
||||
return activityService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
|
|
@ -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<ActivityEnterVo> list(ActivityEnterBo bo, PageQuery pageQuery) {
|
||||
return activityEnterService.queryPageList(bo, pageQuery);
|
||||
public TableDataInfo<ActivityVo> list(ActivityBo bo, PageQuery pageQuery) {
|
||||
return activityService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue