From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/entity/Account.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index 02eb11e..18e66a6 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -1,6 +1,8 @@
package com.moral.entity;
+import java.util.Arrays;
import java.util.Date;
+import java.util.List;
import javax.persistence.Id;
import javax.persistence.Transient;
@@ -71,7 +73,16 @@
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.setRoleName("temp");
+ return Arrays.asList(role);
+ }
@Transient
private Organization organization;
--
Gitblit v1.8.0