From 15e575e34b75c98fa22f879c2f7e894550c1e171 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 19 Apr 2023 18:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.4.0=E3=80=91=E3=80=90=E6=8B=93?=
 =?UTF-8?q?=E5=B1=95=E3=80=91=E5=AF=B9=E6=8E=A5=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/entity/HrOrganization.java   | 32 +++++++++++++++++--
 .../system/modular/user/entity/SysUser.java   |  7 ++++
 .../modular/user/entity/SysUserOrg.java       | 25 +++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
index 7aec6a924..f0890a1d1 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java
@@ -91,7 +91,7 @@ public class HrOrganization extends BaseEntity {
     /**
      * 状态：1-启用，2-禁用
      */
-    @TableField(value = "status_flag",fill = FieldFill.INSERT)
+    @TableField(value = "status_flag", fill = FieldFill.INSERT)
     @ChineseDescription("状态：1-启用，2-禁用")
     private Integer statusFlag;
 
@@ -119,8 +119,36 @@ public class HrOrganization extends BaseEntity {
     /**
      * 删除标记（Y-已删除，N-未删除）
      */
-    @TableField(value = "del_flag",fill = FieldFill.INSERT)
+    @TableField(value = "del_flag", fill = FieldFill.INSERT)
     @ChineseDescription("删除标记（Y-已删除，N-未删除）")
     private String delFlag;
 
+    /**
+     * 主数据orgId
+     */
+    @TableField(value = "master_org_id")
+    @ChineseDescription("主数据orgId")
+    private String masterOrgId;
+
+    /**
+     * 主数据的父级id
+     */
+    @TableField(value = "master_org_parent_id")
+    @ChineseDescription("主数据的父级id")
+    private String masterOrgParentId;
+
+    /**
+     * 主数据的简称
+     */
+    @TableField(value = "master_short_name")
+    @ChineseDescription("主数据的简称")
+    private String masterShortName;
+
+    /**
+     * 主数据组织层级
+     */
+    @TableField(value = "master_level")
+    @ChineseDescription("主数据组织层级")
+    private String masterLevel;
+
 }
diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
index e71aa2c7b..1a62fc5e9 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java
@@ -159,4 +159,11 @@ public class SysUser extends BaseEntity {
      */
     @TableField("login_count")
     private Integer loginCount;
+
+    /**
+     * 主数据用户id
+     */
+    @TableField(value = "master_user_id")
+    private String masterUserId;
+
 }
diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java
index 0c972703e..a6d3c9fa9 100644
--- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java
+++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java
@@ -54,16 +54,41 @@ 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")
+    private String masterOrgId;
+
     /**
      * 职位id
      */
     @TableField("position_id")
     private Long positionId;
 
+    /**
+     * 是否是主部门
+     */
+    @TableField("main_flag")
+    private String mainFlag;
+
+    /**
+     * officeId
+     */
+    @TableField("take_office_id")
+    private String takeOfficeId;
+
+
 }