gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.6.0】【user】更新用户实体外部对接id

pull/55/head
fengshuonan 2023-05-11 13:27:56 +08:00
parent bd14d5e082
commit 3f50e3f890
2 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
View File

@ -1,6 +1,6 @@
package cn.stylefeng.roses.kernel.system.modular.organization.entity; package cn.stylefeng.roses.kernel.system.modular.organization.entity;
import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity;
import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
@ -19,7 +19,7 @@ import java.util.Map;
@TableName(value = "hr_organization", autoResultMap = true) @TableName(value = "hr_organization", autoResultMap = true)
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class HrOrganization extends BaseEntity { public class HrOrganization extends BaseBusinessEntity {
/** /**
* 主键 * 主键
@ -126,25 +126,5 @@ public class HrOrganization extends BaseEntity {
@ChineseDescription("拓展字段") @ChineseDescription("拓展字段")
private Map<String, Object> expandField; private Map<String, Object> expandField;
/**
* 乐观锁
*/
@TableField("version_flag")
@ChineseDescription("乐观锁")
private Long versionFlag;
/**
* 删除标记：Y-已删除，N-未删除
*/
@TableField(value = "del_flag", fill = FieldFill.INSERT)
@ChineseDescription("删除标记：Y-已删除，N-未删除")
private String delFlag;
/**
* 租户号
*/
@TableField("tenant_id")
@ChineseDescription("租户号")
private Long tenantId;
} }

26
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
View File

@ -24,8 +24,11 @@
*/ */
package cn.stylefeng.roses.kernel.system.modular.user.entity; package cn.stylefeng.roses.kernel.system.modular.user.entity;
import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -40,7 +43,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("sys_user") @TableName("sys_user")
public class SysUser extends BaseEntity { public class SysUser extends BaseBusinessEntity {
/** /**
* 主键 * 主键
@ -120,6 +123,12 @@ public class SysUser extends BaseEntity {
@TableField("status_flag") @TableField("status_flag")
private Integer statusFlag; private Integer statusFlag;
/**
* 登录次数
*/
@TableField("login_count")
private Integer loginCount;
/** /**
* 最后登陆IP * 最后登陆IP
*/ */
@ -133,14 +142,9 @@ public class SysUser extends BaseEntity {
private Date lastLoginTime; private Date lastLoginTime;
/** /**
* 删除标记（Y-已删除，N-未删除） * 对接外部主数据的用户id
*/ */
@TableField(value = "del_flag", fill = FieldFill.INSERT) @TableField("master_user_id")
private String delFlag; private String masterUserId;
/**
* 登录次数
*/
@TableField("login_count")
private Integer loginCount;
} }