From cb6874174975a370cb60f1557704c9d49a05f9e6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 05 一月 2024 08:59:40 +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