From 5322ebe732e1cfb1abaf459edec03a6eab949cde Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 04 七月 2024 16:56:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 2e0f357..6f13e7c 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -60,8 +60,13 @@
@ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
@PostMapping("/updateUser")
// @PreAuthorize("hasAuthority('sys:user:update')")
- public Result<SysUserVO> updateUser(@Validated @RequestBody SysUserVO sysUser) {
- return Result.success(sysUserService.updateUser(sysUser));
+ public Result<List<SysUserVO>> updateUser(@Validated @RequestBody SysUserVO sysUser) {
+ //return Result.success(sysUserService.updateUser(sysUser));
+ sysUserService.updateUser(sysUser);
+ GeneralRequest request=new GeneralRequest();
+ request.setKey("");
+ return Result.success(sysUserService.listByUserName(request));
+ //鏇存敼浜嗕慨鏀逛箣鍚庤繑鍥炴墍鏈夌敤鎴峰垪琛�
}
@ApiOperation("閲嶇疆瀵嗙爜")
--
Gitblit v1.8.0