用户导出修改

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java

 package org.dromara.system.domain.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -25,7 +26,7 @@ public class SysUserExportVo implements Serializable {
     /**
      * 用户ID
      */
-    @ExcelProperty(value = "用户序号")
+    @ExcelIgnore
     private Long userId;
 
     /**
@@ -43,6 +44,7 @@ public class SysUserExportVo implements Serializable {
     /**
      * 部门id
      */
+    @ExcelIgnore
     private Long deptId;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java

 package org.dromara.system.domain.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -24,18 +25,6 @@ public class SysUserImportVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 用户ID
-     */
-    @ExcelProperty(value = "用户序号")
-    private Long userId;
-
-    /**
-     * 部门ID
-     */
-    @ExcelProperty(value = "部门编号")
-    private Long deptId;
-
     /**
      * 用户账号
      */
@@ -49,34 +38,34 @@ public class SysUserImportVo implements Serializable {
     private String nickName;
 
     /**
-     * 用户邮箱
+     * 部门id
      */
-    @ExcelProperty(value = "用户邮箱")
-    private String email;
+    @ExcelIgnore
+    private Long deptId;
 
     /**
-     * 手机号码
+     * 归属部门
      */
-    @ExcelProperty(value = "手机号码")
-    private String phonenumber;
+    @ExcelProperty(value = "归属部门")
+    private String deptName;
 
     /**
-     * 身份证号码
+     * 手机号码
      */
-    @ExcelProperty(value = "身份证")
-    private String idCard;
+    @ExcelProperty(value = "手机号码")
+    private String phonenumber;
 
     /**
-     * 微信号
+     * 用户邮箱
      */
-    @ExcelProperty(value = "微信号")
-    private String wechatId;
+    @ExcelProperty(value = "用户邮箱")
+    private String email;
 
     /**
-     * 微信二维码
+     * 身份证号码
      */
-    @ExcelProperty(value = "微信二维码")
-    private Long wechatQrCode;
+    @ExcelProperty(value = "身份证")
+    private String idCard;
 
     /**
      * 用户性别
@@ -92,4 +81,40 @@ public class SysUserImportVo implements Serializable {
     @ExcelDictFormat(dictType = "sys_normal_disable")
     private String status;
 
+    @ExcelProperty("岗位")
+    private String postName;
+
+    /**
+     * 岗位组
+     */
+    @ExcelIgnore
+    private Long[] postIds;
+
+    @ExcelProperty("角色")
+    private String roleName;
+
+    /**
+     * 角色组
+     */
+    @ExcelIgnore
+    private Long[] roleIds;
+
+    /**
+     * 微信号
+     */
+    @ExcelProperty("微信号")
+    private String wechatId;
+
+    /**
+     * 微信二维码
+     */
+    @ExcelProperty("微信二维码")
+    private Long wechatQrCode;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty("备注")
+    private String remark;
+
 }