From 2c86a8bd60deed0dd0e044bad6fb83f75d19a332 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 15:05:50 +0800
Subject: [PATCH] Merge branch 'feature-task'

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 714cbe7..8cf153e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -89,6 +89,9 @@
     /** 瑙掕壊ID */
     private Long roleId;
 
+    /** SQL Server涓殑OA鐢ㄦ埛ID */
+    private Integer oaUserId;
+
     public SysUser()
     {
 
@@ -297,6 +300,16 @@
         this.roleId = roleId;
     }
 
+    public Integer getOaUserId()
+    {
+        return oaUserId;
+    }
+
+    public void setOaUserId(Integer oaUserId)
+    {
+        this.oaUserId = oaUserId;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -319,6 +332,7 @@
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .append("dept", getDept())
+            .append("oaUserId", getOaUserId())
             .toString();
     }
 }

--
Gitblit v1.9.1