From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/platform/src/main/java/com/doumee/api/system/SystemUserController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
index 788a68b..a70010a 100644
--- a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -112,9 +112,16 @@
@ApiOperation("鍒嗛〉鏌ヨ绯荤粺鐢ㄦ埛")
+ @PostMapping("/findAllPage")
+ @RequiresPermissions("system:user:query")
+ public ApiResponse<PageData<SystemUser>> findAllPage (@RequestBody PageWrap<SystemUser> pageWrap) {
+ return ApiResponse.success(systemUserService.findAllList(pageWrap));
+ }
+
+ @ApiOperation("鏌ヨ绯荤粺鐢ㄦ埛")
@PostMapping("/findAllList")
@RequiresPermissions("system:user:query")
- public ApiResponse<PageData<SystemUser>> findAllList (@RequestBody PageWrap<SystemUser> pageWrap) {
+ public ApiResponse<List<SystemUser>> findAllList (@RequestBody SystemUser pageWrap) {
return ApiResponse.success(systemUserService.findAllList(pageWrap));
}
--
Gitblit v1.9.3