From b40c300928c6900fdef06deaf19cd25a2baf0b61 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 10 十一月 2022 14:23:47 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ 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