|
|
|
@ -5,7 +5,6 @@ import java.util.List;
|
|
|
|
|
import javax.validation.constraints.Email;
|
|
|
|
|
import javax.validation.constraints.NotBlank;
|
|
|
|
|
import javax.validation.constraints.Size;
|
|
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
|
|
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
|
|
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
|
|
@ -60,10 +59,6 @@ public class SysUser extends BaseEntity
|
|
|
|
|
@JsonIgnore
|
|
|
|
|
private String password;
|
|
|
|
|
|
|
|
|
|
/** 盐加密 */
|
|
|
|
|
@JsonIgnore
|
|
|
|
|
private String salt;
|
|
|
|
|
|
|
|
|
|
/** 帐号状态(0正常 1停用) */
|
|
|
|
|
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
|
|
|
|
|
private String status;
|
|
|
|
@ -215,16 +210,6 @@ public class SysUser extends BaseEntity
|
|
|
|
|
this.password = password;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public String getSalt()
|
|
|
|
|
{
|
|
|
|
|
return salt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void setSalt(String salt)
|
|
|
|
|
{
|
|
|
|
|
this.salt = salt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public String getStatus()
|
|
|
|
|
{
|
|
|
|
|
return status;
|
|
|
|
@ -326,7 +311,6 @@ public class SysUser extends BaseEntity
|
|
|
|
|
.append("sex", getSex())
|
|
|
|
|
.append("avatar", getAvatar())
|
|
|
|
|
.append("password", getPassword())
|
|
|
|
|
.append("salt", getSalt())
|
|
|
|
|
.append("status", getStatus())
|
|
|
|
|
.append("delFlag", getDelFlag())
|
|
|
|
|
.append("loginIp", getLoginIp())
|
|
|
|
|