From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java | 116 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
index 6842f0a..c43c8a5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
@@ -20,74 +20,74 @@
@NoArgsConstructor
@Accessors(chain = true)
public class SysUserExportVo implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 鐢ㄦ埛ID
- */
- @ExcelProperty(value = "鐢ㄦ埛搴忓彿")
- private Long userId;
+ /**
+ * 鐢ㄦ埛ID
+ */
+ @ExcelProperty(value = "鐢ㄦ埛搴忓彿")
+ private Long userId;
- /**
- * 鐢ㄦ埛璐﹀彿
- */
- @ExcelProperty(value = "鐧诲綍鍚嶇О")
- private String userName;
+ /**
+ * 鐢ㄦ埛璐﹀彿
+ */
+ @ExcelProperty(value = "鐧诲綍鍚嶇О")
+ private String userName;
- /**
- * 鐢ㄦ埛鏄电О
- */
- @ExcelProperty(value = "鐢ㄦ埛鍚嶇О")
- private String nickName;
+ /**
+ * 鐢ㄦ埛鏄电О
+ */
+ @ExcelProperty(value = "鐢ㄦ埛鍚嶇О")
+ private String nickName;
- /**
- * 鐢ㄦ埛閭
- */
- @ExcelProperty(value = "鐢ㄦ埛閭")
- private String email;
+ /**
+ * 鐢ㄦ埛閭
+ */
+ @ExcelProperty(value = "鐢ㄦ埛閭")
+ private String email;
- /**
- * 鎵嬫満鍙风爜
- */
- @ExcelProperty(value = "鎵嬫満鍙风爜")
- private String phonenumber;
+ /**
+ * 鎵嬫満鍙风爜
+ */
+ @ExcelProperty(value = "鎵嬫満鍙风爜")
+ private String phonenumber;
- /**
- * 鐢ㄦ埛鎬у埆
- */
- @ExcelProperty(value = "鐢ㄦ埛鎬у埆", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_user_sex")
- private String sex;
+ /**
+ * 鐢ㄦ埛鎬у埆
+ */
+ @ExcelProperty(value = "鐢ㄦ埛鎬у埆", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_user_sex")
+ private String sex;
- /**
- * 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
- */
- @ExcelProperty(value = "甯愬彿鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_common_status")
- private String status;
+ /**
+ * 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+ */
+ @ExcelProperty(value = "甯愬彿鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_common_status")
+ private String status;
- /**
- * 鏈�鍚庣櫥褰旾P
- */
- @ExcelProperty(value = "鏈�鍚庣櫥褰旾P")
- private String loginIp;
+ /**
+ * 鏈�鍚庣櫥褰旾P
+ */
+ @ExcelProperty(value = "鏈�鍚庣櫥褰旾P")
+ private String loginIp;
- /**
- * 鏈�鍚庣櫥褰曟椂闂�
- */
- @ExcelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
- private Date loginDate;
+ /**
+ * 鏈�鍚庣櫥褰曟椂闂�
+ */
+ @ExcelProperty(value = "鏈�鍚庣櫥褰曟椂闂�")
+ private Date loginDate;
- /**
- * 閮ㄩ棬鍚嶇О
- */
- @ExcelProperty(value = "閮ㄩ棬鍚嶇О")
- private String deptName;
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ExcelProperty(value = "閮ㄩ棬鍚嶇О")
+ private String deptName;
- /**
- * 璐熻矗浜�
- */
- @ExcelProperty(value = "閮ㄩ棬璐熻矗浜�")
- private String leader;
+ /**
+ * 璐熻矗浜�
+ */
+ @ExcelProperty(value = "閮ㄩ棬璐熻矗浜�")
+ private String leader;
}
--
Gitblit v1.9.3