From c62d8002bec6dfd520649a435085dc1f7e3ce147 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 10:36:19 +0800
Subject: [PATCH] 1.押运

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 455691d..bdf1ab4 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -140,7 +140,7 @@
 		@ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
 	})
-	public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query) {
+	public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query) {
 		IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user);
 		return R.data(UserWrapper.build().pageVO(pages));
 	}
@@ -372,5 +372,15 @@
 		return R.success("吊销成功");
 	}
 
+	/**
+	 * 查询押运人员
+	 *
+	 * @return
+	 */
+	@GetMapping("/selectPeo")
+	public R selectPeo(@ApiIgnore UserVO user) {
+		List list = userService.selectPeo(user);
+		return R.data(list);
+	}
 
 }

--
Gitblit v1.9.3