From 49f101308f903a784235c09192de63c8c385e2a0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 25 五月 2024 10:05:56 +0800
Subject: [PATCH] !543 回退 'Pull Request !542 : 更新SnailJob版本到1.0.0-beta2' Merge pull request !543 from 疯狂的狮子Li/revert-merge-542-dev
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
index b7fc480..37ec6b7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
@@ -20,7 +20,6 @@
@Data
@NoArgsConstructor
-@AutoMapper(target = SysUserVo.class, convertGenerate = false)
public class SysUserExportVo implements Serializable {
@Serial
@@ -59,14 +58,14 @@
/**
* 鐢ㄦ埛鎬у埆
*/
- @ExcelProperty(value = "鐢ㄦ埛鎬у埆", index = 6, converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "鐢ㄦ埛鎬у埆", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_user_sex")
private String sex;
/**
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ExcelProperty(value = "甯愬彿鐘舵��", index = 7, converter = ExcelDictConvert.class)
+ @ExcelProperty(value = "甯愬彿鐘舵��", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
@@ -85,15 +84,13 @@
/**
* 閮ㄩ棬鍚嶇О
*/
- @ReverseAutoMapping(target = "deptName", source = "dept.deptName")
@ExcelProperty(value = "閮ㄩ棬鍚嶇О")
private String deptName;
/**
* 璐熻矗浜�
*/
- @ReverseAutoMapping(target = "leader", source = "dept.leader")
@ExcelProperty(value = "閮ㄩ棬璐熻矗浜�")
- private String leader;
+ private String leaderName;
}
--
Gitblit v1.9.3