From 5459d714b3d6fd4a2fc8b48775ccdc9ea8678279 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 14 四月 2022 10:13:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index 5201d60..42c4ce9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -80,7 +80,6 @@
         loginUserInfo.setName(admin.getNickName());
         loginUserInfo.setAccount(admin.getUsername());
         loginUserInfo.setStatus(admin.getStatus());
-        loginUserInfo.setIcon(admin.getIcon());
         loginUserInfo.setIp(IpUtil.getRealIp());
         loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
         loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));

--
Gitblit v1.9.3