From 67a7a24b47d71dd843dd0b17c5cdf9f519e29d5d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 30 Jun 2020 13:20:25 +0800
Subject: [PATCH] update大屏左侧站点设备查询优化及设备因子名称显示null问题

---
 src/main/java/com/moral/entity/Account.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index 1498df9..18e66a6 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -74,11 +74,13 @@
 
 	private String userName;
 	@Transient
+	private JwtTokenVersion jwtTokenVersion;
+	@Transient
     private List<Role> Roles;
 	// TODO ������������
 	public List<Role> getRoles(){
 		Role role = new Role();
-		role.setName("temp");
+		role.setRoleName("temp");
 		return Arrays.asList(role);
 	}
 	@Transient

--
Gitblit v1.8.0