|
|
@@ -5,7 +5,6 @@ import java.util.List;
|
|
5
|
5
|
import javax.validation.constraints.Email;
|
|
6
|
6
|
import javax.validation.constraints.NotBlank;
|
|
7
|
7
|
import javax.validation.constraints.Size;
|
|
8
|
|
-
|
|
9
|
8
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
|
10
|
9
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
11
|
10
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
|
@@ -60,10 +59,6 @@ public class SysUser extends BaseEntity
|
|
60
|
59
|
@JsonIgnore
|
|
61
|
60
|
private String password;
|
|
62
|
61
|
|
|
63
|
|
- /** 盐加密 */
|
|
64
|
|
- @JsonIgnore
|
|
65
|
|
- private String salt;
|
|
66
|
|
-
|
|
67
|
62
|
/** 帐号状态(0正常 1停用) */
|
|
68
|
63
|
@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
|
|
69
|
64
|
private String status;
|
|
|
@@ -215,16 +210,6 @@ public class SysUser extends BaseEntity
|
|
215
|
210
|
this.password = password;
|
|
216
|
211
|
}
|
|
217
|
212
|
|
|
218
|
|
- public String getSalt()
|
|
219
|
|
- {
|
|
220
|
|
- return salt;
|
|
221
|
|
- }
|
|
222
|
|
-
|
|
223
|
|
- public void setSalt(String salt)
|
|
224
|
|
- {
|
|
225
|
|
- this.salt = salt;
|
|
226
|
|
- }
|
|
227
|
|
-
|
|
228
|
213
|
public String getStatus()
|
|
229
|
214
|
{
|
|
230
|
215
|
return status;
|
|
|
@@ -326,7 +311,6 @@ public class SysUser extends BaseEntity
|
|
326
|
311
|
.append("sex", getSex())
|
|
327
|
312
|
.append("avatar", getAvatar())
|
|
328
|
313
|
.append("password", getPassword())
|
|
329
|
|
- .append("salt", getSalt())
|
|
330
|
314
|
.append("status", getStatus())
|
|
331
|
315
|
.append("delFlag", getDelFlag())
|
|
332
|
316
|
.append("loginIp", getLoginIp())
|