修改用户管理相关

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -32,11 +32,11 @@ public class SysUser extends BaseEntity
     private Long deptId;
 
     /** 用户账号 */
-    @Excel(name = "登录名称")
+    @Excel(name = "登录账号")
     private String userName;
 
     /** 用户昵称 */
-    @Excel(name = "用户名称")
+    @Excel(name = "用户姓名")
     private String nickName;
 
     /** 用户邮箱 */
@@ -94,6 +94,8 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    private Integer taskCount;
+
     public SysUser()
     {
 
@@ -134,8 +136,8 @@ public class SysUser extends BaseEntity
         this.deptId = deptId;
     }
 
-    @Xss(message = "用户昵称不能包含脚本字符")
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
+    @Xss(message = "用户姓名不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户姓名长度不能超过30个字符")
     public String getNickName()
     {
         return nickName;
@@ -146,9 +148,9 @@ public class SysUser extends BaseEntity
         this.nickName = nickName;
     }
 
-    @Xss(message = "用户账号不能包含脚本字符")
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
+    @Xss(message = "登录账号不能包含脚本字符")
+    @NotBlank(message = "登录账号不能为空")
+    @Size(min = 0, max = 30, message = "登录账号长度不能超过30个字符")
     public String getUserName()
     {
         return userName;
@@ -310,6 +312,14 @@ public class SysUser extends BaseEntity
         this.groupName = groupName;
     }
 
+    public Integer getTaskCount() {
+        return taskCount;
+    }
+
+    public void setTaskCount(Integer taskCount) {
+        this.taskCount = taskCount;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)