Merge branch 'master' into docker_package

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

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

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

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