From f0376f72170c2eb236bec5560b8c5734edd222f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 31 Mar 2021 17:16:40 +0800
Subject: [PATCH] common模块:     增加了convert工具类,驼峰和下划线相互转换     更新了Date工具类,添加根据Date,day获取目标date的方法     更新WebUtils工具类,添加获取请求Ip方法 manage模块:     组织和后台用户增删改查模块全部完成     增加aop用作日志插入

---
 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