From b69d2017fecdad6a1c9a09c0006e70ecea9efed0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 18:39:41 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 7815ece..ce61849 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -100,6 +100,7 @@
map.put("token", token);
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
return ResultData.success(map);
}
@@ -125,6 +126,7 @@
map.put("token", token);
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
return ResultData.success(map);
}
--
Gitblit v1.7.1