From cf622d6cb6c76f4cbee4be10288c22878d36a043 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 16 十月 2023 10:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
index d1998b7..4ff330d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/LoginController.java
@@ -101,6 +101,8 @@
User byId = userService.getById(user.getId());
//获取用户头像 Obtain user profile
String avatar = byId.getAvatar();
+ Integer objectType = user.getObjectType();
+
model.addAttribute("roleNames", role.getName());
model.addAttribute("language", language);
model.addAttribute("avatar", avatar);
@@ -113,8 +115,9 @@
return "/index.html";
}
+
/**
- * 跳转到登录页面
+ * 跳转到场地管理页面
*/
@RequestMapping(value = "/login", method = RequestMethod.GET)
public String login() {
@@ -124,7 +127,6 @@
return "/login.html" ;
}
}
-
/**
* 点击登录执行的动作
*/
--
Gitblit v1.7.1