From 9bc2d2981b540aa291cfecde5d33615df56a078b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 22 七月 2022 09:59:19 +0800
Subject: [PATCH] update springboot 2.7.1 => 2.7.2 update hutool 5.8.3 => 5.8.4 update okhttp 4.9.1 => 4.10.0 update lock4j 2.2.1 => 2.2.2 update aws-java-sdk-s3 1.12.248 => 1.12.264 修复依赖安全漏洞 update aliyun.sms 2.0.9 => 2.0.16 update tencent.sms 3.1.537 => 3.1.555 update guava 30.0-jre => 31.1-jre
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java | 86 +++++++++++++++++++++---------------------
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java
index 9c1a7d3..d461332 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java
@@ -18,56 +18,56 @@
@NoArgsConstructor
// @Accessors(chain = true) // 瀵煎叆涓嶅厑璁镐娇鐢� 浼氭壘涓嶅埌set鏂规硶
public class SysUserImportVo 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;
- /**
- * 閮ㄩ棬ID
- */
- @ExcelProperty(value = "閮ㄩ棬缂栧彿")
- private Long deptId;
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ExcelProperty(value = "閮ㄩ棬缂栧彿")
+ private Long deptId;
- /**
- * 鐢ㄦ埛璐﹀彿
- */
- @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_normal_disable")
+ private String status;
}
--
Gitblit v1.9.3