From 086adfdf1d5340a3503da5b5ebcae9073775450e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 十二月 2024 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/web/system/UserController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/system/UserController.java b/src/main/java/com/mzl/flower/web/system/UserController.java
index 38c02d1..961dc0a 100644
--- a/src/main/java/com/mzl/flower/web/system/UserController.java
+++ b/src/main/java/com/mzl/flower/web/system/UserController.java
@@ -11,6 +11,7 @@
import com.mzl.flower.dto.request.system.UpdateUserDTO;
import com.mzl.flower.dto.response.system.UserDetailsDTO;
import com.mzl.flower.dto.response.system.UserListDTO;
+import com.mzl.flower.dto.response.system.UserListInfoDTO;
import com.mzl.flower.service.system.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -102,4 +103,10 @@
return returnData(R.SUCCESS.getCode(), null);
}
+ @GetMapping("/user/list")
+ @ApiOperation(value = "查询用户列表")
+ public ResponseEntity<ReturnDataDTO<Page<UserListInfoDTO>>> searchAllUser(@ModelAttribute SearchUserDTO dto, Page page) {
+ return returnData(R.SUCCESS.getCode(), userService.searchUserInfos(dto, page));
+ }
+
}
--
Gitblit v1.9.3