feat:修改样式

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

@@ -32,9 +32,16 @@ public class SysUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
+    /** 用户名称 */
+    @Excel(name = "人员姓名")
+    private String userName;
+
+    /** 登录名称 */
+    @Excel(name = "登录账号")
+    private String loginName;
+
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
@@ -47,14 +54,6 @@ public class SysUser extends BaseEntity
     @TableField(exist=false)
     private Long roleId;
 
-    /** 登录名称 */
-    @Excel(name = "登录名称")
-    private String loginName;
-
-    /** 用户名称 */
-    @Excel(name = "用户名称")
-    private String userName;
-
     /** 用户类型 */
     private String userType;
 
@@ -80,18 +79,15 @@ public class SysUser extends BaseEntity
     private String salt;
 
     /** 帐号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
     private String delFlag;
 
     /** 最后登录IP */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
     /** 最后登录时间 */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
     /** 密码最后更新时间 */
@@ -195,27 +191,21 @@ public class SysUser extends BaseEntity
     private String graduate;
 
     /** 生效时间 */
-    @Excel(name = "生效时间")
     private String startdate;
 
     /** 失效时间 */
-    @Excel(name = "失效时间")
     private String enddate;
 
     /** 健康状况 */
-    @Excel(name = "健康状况")
     private String helthy;
 
     /** 审核状态 */
-    @Excel(name = "审核状态",readConverterExp = "0=通过,1=未通过,2=待审核")
     private String examine;
 
     /** 审核时间 */
-    @Excel(name = "审核时间")
     private String examinedate;
 
     /** 审核人 */
-    @Excel(name = "审核人")
     private String examineuser;
 
     /** 是否持有护照和港澳通行证 */
@@ -294,8 +284,7 @@ public class SysUser extends BaseEntity
 
     /** 部门对象 */
     @Excels({
-        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-        @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
+        @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT)
     })
     @TableField(exist=false)
     private SysDept dept;