From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java b/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
index 90a6718..7020079 100644
--- a/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
+++ b/ycl-pojo/src/main/java/com/ycl/system/entity/SysUser.java
@@ -12,7 +12,7 @@
/**
* 鐢ㄦ埛瀵硅薄 sys_user
- *
+ *
* @author ruoyi
*/
public class SysUser extends BaseEntity
@@ -21,6 +21,9 @@
/** 鐢ㄦ埛ID */
private Long userId;
+
+ /** 鍗曚綅ID */
+ private Integer unitId;
/** 閮ㄩ棬ID */
private Long deptId;
@@ -50,7 +53,7 @@
private String status;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
+ private Integer delFlag;
/** 鏈�鍚庣櫥褰旾P */
private String loginIp;
@@ -58,6 +61,8 @@
/** 鏈�鍚庣櫥褰曟椂闂� */
private Date loginDate;
+ /** 鏄惁涓虹涓�娆＄櫥褰� 0涓虹涓�娆＄櫥褰曢渶瑕佷慨鏀瑰瘑鐮� */
+ private Short firstLogin;
/** 閮ㄩ棬瀵硅薄 */
private SysDept dept;
@@ -76,6 +81,22 @@
public SysUser()
{
+ }
+
+ public Integer getUnitId() {
+ return unitId;
+ }
+
+ public void setUnitId(Integer unitId) {
+ this.unitId = unitId;
+ }
+
+ public Short getFirstLogin() {
+ return firstLogin;
+ }
+
+ public void setFirstLogin(Short firstLogin) {
+ this.firstLogin = firstLogin;
}
public SysUser(Long userId)
@@ -201,12 +222,12 @@
this.status = status;
}
- public String getDelFlag()
+ public Integer getDelFlag()
{
return delFlag;
}
- public void setDelFlag(String delFlag)
+ public void setDelFlag(Integer delFlag)
{
this.delFlag = delFlag;
}
@@ -303,6 +324,7 @@
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("dept", getDept())
+ .append("firstLogin",getFirstLogin())
.toString();
}
}
--
Gitblit v1.8.0