Merge remote-tracking branch 'origin/master'

kaiyu

2020-12-07 cf42a18aba4da77141dd0ea65918444636f899e1

 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