From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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