From 6b74ea676cc97961e822e86c3e79e3329bc771b2 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 24 Sep 2020 16:28:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=96=87=E5=AD=97=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/system/api/domain/SysUser.java | 8 ++++---- .../main/java/com/ruoyi/system/api/model/LoginUser.java | 2 +- sql/ry_20200924.sql | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java index e0b84ce1..a9bc15e0 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java @@ -67,12 +67,12 @@ public class SysUser extends BaseEntity /** 删除标志（0代表存在 2代表删除） */ private String delFlag; - /** 最后登陆IP */ - @Excel(name = "最后登陆IP", type = Type.EXPORT) + /** 最后登录IP */ + @Excel(name = "最后登录IP", 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; /** 部门对象 */ diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java index 3ff17997..2f00e102 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java @@ -29,7 +29,7 @@ public class LoginUser implements Serializable private String username; /** - * 登陆时间 + * 登录时间 */ private Long loginTime; diff --git a/sql/ry_20200924.sql b/sql/ry_20200924.sql index 5d2e6006..2011ea77 100644 --- a/sql/ry_20200924.sql +++ b/sql/ry_20200924.sql @@ -52,8 +52,8 @@ create table sys_user ( password varchar(100) default '' comment '密码', status char(1) default '0' comment '帐号状态（0正常 1停用）', del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - login_ip varchar(50) default '' comment '最后登陆IP', - login_date datetime comment '最后登陆时间', + login_ip varchar(50) default '' comment '最后登录IP', + login_date datetime comment '最后登录时间', create_by varchar(64) default '' comment '创建者', create_time datetime comment '创建时间', update_by varchar(64) default '' comment '更新者',