1.0.0

pom.xml

@@ -22,7 +22,7 @@
 
 
         <swagger.version>2.9.2</swagger.version>
         <swagger.version>2.9.2</swagger.version>
         <alibaba.druid.version>1.1.22</alibaba.druid.version>
         <alibaba.druid.version>1.1.22</alibaba.druid.version>
-        <mybatis.plus.version>3.4.3</mybatis.plus.version>
+        <mybatis.plus.version>3.4.0</mybatis.plus.version>
         <pagehelper.version>5.2.0</pagehelper.version>
         <pagehelper.version>5.2.0</pagehelper.version>
         <jjwt.version>0.9.1</jjwt.version>
         <jjwt.version>0.9.1</jjwt.version>
         <fastjson.version>1.2.76</fastjson.version>
         <fastjson.version>1.2.76</fastjson.version>

user-server/src/main/java/com/zq/user/controller/admin/UserAdminController.java

 package com.zq.user.controller.admin;
 package com.zq.user.controller.admin;
 
 
+import com.zq.common.entity.AppUser;
+import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.user.service.UserService;
 import com.zq.user.service.UserService;
 import com.zq.user.vo.FindAppUserVo;
 import com.zq.user.vo.FindAppUserVo;
@@ -25,7 +27,7 @@ public class UserAdminController {
 
 
     @ApiOperation("获取用户列表")
     @ApiOperation("获取用户列表")
     @PostMapping(value = "/getUserList")
     @PostMapping(value = "/getUserList")
-    public ResultVo getUserList(@RequestBody FindAppUserVo vo) {
+    public ResultVo<PageVo<AppUser>> getUserList(@RequestBody FindAppUserVo vo) {
         return ResultVo.success(userService.getUserList(vo));
         return ResultVo.success(userService.getUserList(vo));
     }
     }
 
 

user-server/src/main/java/com/zq/user/controller/app/UserController.java

@@ -3,9 +3,11 @@ package com.zq.user.controller.app;
 
 
 import com.zq.common.annotation.Limit;
 import com.zq.common.annotation.Limit;
 import com.zq.common.config.limit.LimitType;
 import com.zq.common.config.limit.LimitType;
+import com.zq.common.entity.AppUser;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.ValidateUtil;
 import com.zq.common.utils.ValidateUtil;
 import com.zq.common.vo.ApiTokenVo;
 import com.zq.common.vo.ApiTokenVo;
+import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.common.vo.ResultVo;
 import com.zq.user.service.UserService;
 import com.zq.user.service.UserService;
 import com.zq.user.vo.FindAppUserVo;
 import com.zq.user.vo.FindAppUserVo;
@@ -89,7 +91,7 @@ public class UserController {
 
 
     @ApiOperation("获取用户列表")
     @ApiOperation("获取用户列表")
     @PostMapping(value = "/getUserList")
     @PostMapping(value = "/getUserList")
-    public ResultVo getUserList(@RequestBody FindAppUserVo vo) {
+    public ResultVo<PageVo<AppUser>> getUserList(@RequestBody FindAppUserVo vo) {
         return ResultVo.success(userService.getUserList(vo));
         return ResultVo.success(userService.getUserList(vo));
     }
     }
 
 

user-server/src/main/java/com/zq/user/service/UserService.java

@@ -13,6 +13,7 @@ import com.zq.common.http.HttpRequestUtils;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.vo.ApiTokenVo;
 import com.zq.common.vo.ApiTokenVo;
+import com.zq.common.vo.PageVo;
 import com.zq.user.dao.AppUserDao;
 import com.zq.user.dao.AppUserDao;
 import com.zq.user.manager.UserCacheKeys;
 import com.zq.user.manager.UserCacheKeys;
 import com.zq.user.vo.FindAppUserVo;
 import com.zq.user.vo.FindAppUserVo;
@@ -162,7 +163,7 @@ public class UserService {
      * @param vo
      * @param vo
      * @return
      * @return
      */
      */
-    public Object getUserList(FindAppUserVo vo) {
+    public PageVo<AppUser> getUserList(FindAppUserVo vo) {
         LambdaQueryWrapper<AppUser> lambdaQuery = Wrappers.lambdaQuery(AppUser.class);
         LambdaQueryWrapper<AppUser> lambdaQuery = Wrappers.lambdaQuery(AppUser.class);
         lambdaQuery.orderByAsc(AppUser::getId);
         lambdaQuery.orderByAsc(AppUser::getId);