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/SysRole.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
index 488d49c..87c7821 100644
--- a/common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
+++ b/common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java
@@ -4,6 +4,9 @@
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+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;
@@ -21,6 +24,7 @@
 
     /** 瑙掕壊ID */
     @Excel(name = "瑙掕壊搴忓彿", cellType = ColumnType.NUMERIC)
+    @TableId(value = "role_id", type = IdType.AUTO)
     private Long roleId;
 
     /** 瑙掕壊鍚嶇О */

--
Gitblit v1.8.0