From 647e68854e61dcd10a89beb43431bfc70620b59f Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Thu, 11 May 2023 13:47:36 +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=E6=9C=BA=E6=9E=84=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=BB?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/user/entity/SysUserOrg.java       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java
index 0c972703e..9c4d90635 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java
@@ -25,12 +25,16 @@
 package cn.stylefeng.roses.kernel.system.modular.user.entity;
 
 import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Map;
+
 /**
  * 企业员工表，用户-组织机构的关联
  *
@@ -54,16 +58,43 @@ public class SysUserOrg extends BaseEntity {
     @TableField("user_id")
     private Long userId;
 
+    /**
+     * 对接外部主数据的用户id
+     */
+    @TableField("master_user_id")
+    private String masterUserId;
+
     /**
      * 所属机构id
      */
     @TableField("org_id")
     private Long orgId;
 
+    /**
+     * 对接外部主数据的机构id
+     */
+    @TableField("master_org_id")
+    @ChineseDescription("对接外部主数据的机构id")
+    private String masterOrgId;
+
     /**
      * 职位id
      */
     @TableField("position_id")
     private Long positionId;
 
+    /**
+     * 是否是主部门：Y-是，N-不是
+     */
+    @TableField("main_flag")
+    @ChineseDescription("是否是主部门：Y-是，N-不是")
+    private String mainFlag;
+
+    /**
+     * 拓展字段
+     */
+    @TableField(value = "expand_field", typeHandler = JacksonTypeHandler.class)
+    @ChineseDescription("拓展字段")
+    private Map<String, Object> expandField;
+
 }