wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-11-14 14:37:04 +08:00
parent 0943e68d21 7f224cf1a3
commit d19fad286a
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/sys/dto/SysUserDTO.java
View File

@ -25,6 +25,7 @@ import java.util.List;
@Data @Data
@ApiModel(value = "用户管理") @ApiModel(value = "用户管理")
public class SysUserDTO implements Serializable { public class SysUserDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "id") @ApiModelProperty(value = "id")
@ -84,4 +85,7 @@ public class SysUserDTO implements Serializable {
@ApiModelProperty(value = "部门名称") @ApiModelProperty(value = "部门名称")
private String deptName; private String deptName;
@ApiModelProperty(value = "登录失败次数")
private Integer frequency;
} }

12
renren-admin/src/main/java/io/renren/modules/sys/enums/UserStatusEnum.java
View File

@ -6,8 +6,18 @@ package io.renren.modules.sys.enums;
* @since 1.0.0 * @since 1.0.0
*/ */
public enum UserStatusEnum { public enum UserStatusEnum {
/**
* 停用
*/
DISABLE(0), DISABLE(0),
ENABLED(1); /**
* 正常
*/
ENABLED(1),
/**
* 锁定
*/
LOCKED(2);
private int value; private int value;