From 364811c321ca9b3af58f3ec85ca5de0183a5e57b Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 19 六月 2023 17:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
index 4fe20fa..5322e78 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
@@ -142,6 +142,12 @@
 		return R.data(UserWrapper.build().pageVO(pages));
 	}
 
+	@GetMapping("/allPage")
+	public R<List<UserVO>> allPage(User user,Long deptId) {
+		List<User> userss = userService.selectAllUser(user,deptId);
+		return R.data(UserWrapper.build().listVO(userss));
+	}
+
 	/**
 	 * 鏂板鎴栦慨鏀�
 	 */

--
Gitblit v1.9.3