From 50d262111395f9c0a3c986f87324ada90fcbc4f8 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 03 十一月 2022 15:06:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
index 8c134dd..6b61c82 100644
--- a/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/RoleManagementController.java
@@ -77,9 +77,9 @@
     @ApiOperation("编辑角色")
     @PostMapping("/update")
     @Authorization
-    public ResultData updateConfig(@RequestBody RoleManagementEntity entity)
+    public ResultData updateConfig(@RequestBody RoleManagementEntity entity,@CurrentUser SysUser sysUser)
     {
-//        entity.setUpdateUserId(sysUser.getUserId()+"");
+        entity.setUpdateUserId(sysUser.getUserId()+"");
         return toAjax(iRoleManagementService.updateConfig(entity));
     }
 

--
Gitblit v1.7.1