From 65007f6811e580d8660340b8216296e68fae598c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 01 Dec 2020 16:04:18 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

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

diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index 86f78d2..18e66a6 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -80,7 +80,7 @@
 	// TODO ������������
 	public List<Role> getRoles(){
 		Role role = new Role();
-		role.setName("temp");
+		role.setRoleName("temp");
 		return Arrays.asList(role);
 	}
 	@Transient

--
Gitblit v1.8.0