From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/Account.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index bc31017..86f78d2 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -1,8 +1,11 @@
package com.moral.entity;
+import java.util.Arrays;
import java.util.Date;
+import java.util.List;
import javax.persistence.Id;
+import javax.persistence.Transient;
import lombok.Data;
@@ -68,7 +71,19 @@
* @mbggenerated Thu Dec 07 16:17:21 CST 2017
*/
private Date expireTime;
-
+
+ private String userName;
+ @Transient
+ private JwtTokenVersion jwtTokenVersion;
+ @Transient
+ private List<Role> Roles;
+ // TODO ������������
+ public List<Role> getRoles(){
+ Role role = new Role();
+ role.setName("temp");
+ return Arrays.asList(role);
+ }
+ @Transient
private Organization organization;
}
\ No newline at end of file
--
Gitblit v1.8.0