Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-01 65007f6811e580d8660340b8216296e68fae598c

 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