From 4d99b3597277e8ddf69718c75968436f1bbed652 Mon Sep 17 00:00:00 2001
From: 15815213711 <a13118667520@163.com>
Date: 星期二, 29 七月 2025 11:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into yagwly_fa_master

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

diff --git a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index d169139..24ba924 100644
--- a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -3,6 +3,9 @@
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -23,6 +26,7 @@
 
     /** 鐢ㄦ埛ID */
     @Excel(name = "鐢ㄦ埛搴忓彿", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "鐢ㄦ埛缂栧彿")
+    @TableId(value = "user_id", type = IdType.AUTO)
     private Long userId;
 
     /** 閮ㄩ棬ID */

--
Gitblit v1.8.0