From 2a7342ec437b86bf95fb6ec2af6bc082d8455b3d Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 30 三月 2021 15:23:04 +0800
Subject: [PATCH] !195 读取excel增加非空判断 Merge pull request !195 from 叫我宏锅锅/yuhong
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index f7e68e7..4c35925 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -68,12 +68,12 @@
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
- /** 鏈�鍚庣櫥闄咺P */
- @Excel(name = "鏈�鍚庣櫥闄咺P", type = Type.EXPORT)
+ /** 鏈�鍚庣櫥褰旾P */
+ @Excel(name = "鏈�鍚庣櫥褰旾P", type = Type.EXPORT)
private String loginIp;
- /** 鏈�鍚庣櫥闄嗘椂闂� */
- @Excel(name = "鏈�鍚庣櫥闄嗘椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+ /** 鏈�鍚庣櫥褰曟椂闂� */
+ @Excel(name = "鏈�鍚庣櫥褰曟椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
private Date loginDate;
/** 閮ㄩ棬瀵硅薄 */
--
Gitblit v1.9.3