From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemUserController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemUserController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemUserController.java
index 09e1246..986d45e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemUserController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/system/SystemUserController.java
@@ -113,10 +113,12 @@
 
 
 
-    @ApiOperation("鍒嗛〉鏌ヨ绯荤粺鐢ㄦ埛")
+
+
+    @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