Merge remote-tracking branch 'origin/dev' into dev

mall-admin/src/main/java/com/macro/mall/bo/AdminUserDetails.java

@@ -24,6 +24,7 @@ public class AdminUserDetails implements UserDetails {
         this.resourceList = resourceList;
     }
 
+    // 获取当前用户信息
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         //返回当前用户所拥有的资源
@@ -32,11 +33,15 @@ public class AdminUserDetails implements UserDetails {
                 .collect(Collectors.toList());
     }
 
+
+    // 获取密码
     @Override
     public String getPassword() {
         return umsAdmin.getPassword();
     }
 
+
+    //获取用户名
     @Override
     public String getUsername() {
         return umsAdmin.getUsername();