From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java
index c24560c..5ae756b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/model/vos/SelfUserEntity.java
@@ -1,11 +1,11 @@
package com.panzhihua.auth.model.vos;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -61,7 +61,6 @@
*/
private boolean isEnabled = true;
-
public static long getSerialVersionUID() {
return serialVersionUID;
}
@@ -92,22 +91,12 @@
this.password = password;
}
-
- public void setAuthorities(Collection<GrantedAuthority> authorities) {
- this.authorities = authorities;
- }
-
-
- public void setEnabled(boolean enabled) {
- isEnabled = enabled;
+ public String getStatus() {
+ return status;
}
public void setStatus(String status) {
this.status = status;
- }
-
- public String getStatus() {
- return status;
}
public String getDisplayName() {
@@ -131,6 +120,10 @@
return authorities;
}
+ public void setAuthorities(Collection<GrantedAuthority> authorities) {
+ this.authorities = authorities;
+ }
+
@Override
public boolean isAccountNonExpired() {
return isAccountNonExpired;
@@ -150,4 +143,8 @@
public boolean isEnabled() {
return isEnabled;
}
+
+ public void setEnabled(boolean enabled) {
+ isEnabled = enabled;
+ }
}
\ No newline at end of file
--
Gitblit v1.7.1