From 3f50e3f890e04f17319bfbd5d9e31a54f3e09818 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 11 May 2023 13:27:56 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90user=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E5=AE=9E=E4=BD=93=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=AF=B9=E6=8E=A5id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/entity/HrOrganization.java   | 24 ++---------------
 .../system/modular/user/entity/SysUser.java   | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
index 15dc9aa0b..f9ec02336 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
@@ -1,6 +1,6 @@
 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 com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
@@ -19,7 +19,7 @@ import java.util.Map;
 @TableName(value = "hr_organization", autoResultMap = true)
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class HrOrganization extends BaseEntity {
+public class HrOrganization extends BaseBusinessEntity {
 
     /**
      * 主键
@@ -126,25 +126,5 @@ public class HrOrganization extends BaseEntity {
     @ChineseDescription("拓展字段")
     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;
 
 }
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
index 765e1f429..f3290b645 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
@@ -24,8 +24,11 @@
  */
 package cn.stylefeng.roses.kernel.system.modular.user.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity;
+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.EqualsAndHashCode;
 
@@ -40,7 +43,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Data
 @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")
     private Integer statusFlag;
 
+    /**
+     * 登录次数
+     */
+    @TableField("login_count")
+    private Integer loginCount;
+
     /**
      * 最后登陆IP
      */
@@ -133,14 +142,9 @@ public class SysUser extends BaseEntity {
     private Date lastLoginTime;
 
     /**
-     * 删除标记（Y-已删除，N-未删除）
+     * 对接外部主数据的用户id
      */
-    @TableField(value = "del_flag", fill = FieldFill.INSERT)
-    private String delFlag;
+    @TableField("master_user_id")
+    private String masterUserId;
 
-    /**
-     * 登录次数
-     */
-    @TableField("login_count")
-    private Integer loginCount;
 }