From c1f06f52a6b7f3337bacd98feb55aca6af8e6e2c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 05 七月 2024 08:32:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 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