From b508e6f20238caf6f000a2ac617bb6a4ca37d56b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 11 十二月 2019 18:12:00 +0800
Subject: [PATCH] 新增用户导入
---
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
index 6c2981e..1a1963d 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
@@ -9,6 +9,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
import com.ruoyi.framework.aspectj.lang.annotation.Excels;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -26,6 +27,7 @@
private Long userId;
/** 閮ㄩ棬ID */
+ @Excel(name = "閮ㄩ棬缂栧彿", type = Type.IMPORT)
private Long deptId;
/** 鐢ㄦ埛璐﹀彿 */
@@ -65,15 +67,18 @@
private String delFlag;
/** 鏈�鍚庣櫥闄咺P */
- @Excel(name = "鏈�鍚庣櫥闄咺P")
+ @Excel(name = "鏈�鍚庣櫥闄咺P", type = Type.EXPORT)
private String loginIp;
/** 鏈�鍚庣櫥闄嗘椂闂� */
- @Excel(name = "鏈�鍚庣櫥闄嗘椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏈�鍚庣櫥闄嗘椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate;
/** 閮ㄩ棬瀵硅薄 */
- @Excels({ @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName"), @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader") })
+ @Excels({
+ @Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
+ @Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
+ })
private SysDept dept;
/** 瑙掕壊瀵硅薄 */
--
Gitblit v1.9.3