From 89c6943973621c6dfc23844999245cc35ee477b4 Mon Sep 17 00:00:00 2001 From: kaiyu <404897439@qq.com> Date: Wed, 07 Apr 2021 17:05:51 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev --- screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java index 366b14d..ce249a6 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/GroupServiceImpl.java @@ -133,10 +133,8 @@ } else { queryWrapper.orderByAsc(order.toString(), "id"); } - Page<Group> groupPage = groupMapper.selectPage(pageData, queryWrapper); - - pageData.setRecords(groupPage.getRecords()); - return groupPage; + groupMapper.selectPage(pageData, queryWrapper); + return pageData; } } -- Gitblit v1.8.0