Merge branch 'master' of http://122.51.230.86:3000/dianliang/dl_admin
This commit is contained in:
commit
1d5b73a9b6
@ -52,7 +52,7 @@ public class BusiNoticeController extends BaseController
|
|||||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize)
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize)
|
||||||
{
|
{
|
||||||
Page<BusiNotice> page = new Page<>(pageNum, pageSize);
|
Page<BusiNotice> page = new Page<>(pageNum, pageSize);
|
||||||
IPage<BusiNotice> list = busiNoticeService.queryListPage(query,page);
|
IPage<BusiNoticeVo> list = busiNoticeService.queryListPage(query,page);
|
||||||
return success(list);
|
return success(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ import org.apache.ibatis.annotations.Mapper;
|
|||||||
*/
|
*/
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface BusiNoticeMapper extends BaseMapper<BusiNotice> {
|
public interface BusiNoticeMapper extends BaseMapper<BusiNotice> {
|
||||||
IPage<BusiNotice> queryListPage(@Param("entity") BusiNoticeQuery query, Page<BusiNotice> page);
|
IPage<BusiNoticeVo> queryListPage(@Param("entity") BusiNoticeQuery query, Page<BusiNotice> page);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询博主报名的通告
|
* 查询博主报名的通告
|
||||||
|
@ -42,7 +42,7 @@ public interface IBusiNoticeService extends IService<BusiNotice>
|
|||||||
* @param query 查询参数
|
* @param query 查询参数
|
||||||
* @param page 分页参数
|
* @param page 分页参数
|
||||||
*/
|
*/
|
||||||
IPage<BusiNotice> queryListPage(BusiNoticeQuery query, Page<BusiNotice> page);
|
IPage<BusiNoticeVo> queryListPage(BusiNoticeQuery query, Page<BusiNotice> page);
|
||||||
/**
|
/**
|
||||||
* 保存
|
* 保存
|
||||||
* @param data 保存参数
|
* @param data 保存参数
|
||||||
|
@ -47,7 +47,7 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
|
|||||||
private NoticeUtils noticeUtils;
|
private NoticeUtils noticeUtils;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IPage<BusiNotice> queryListPage(BusiNoticeQuery query, Page<BusiNotice> page) {
|
public IPage<BusiNoticeVo> queryListPage(BusiNoticeQuery query, Page<BusiNotice> page) {
|
||||||
return busiNoticeMapper.queryListPage(query, page);
|
return busiNoticeMapper.queryListPage(query, page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user