From cdd9ef5944a1cda82d98f1544fb451c7dd4f8c3d Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:20:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
index 2f978e5..5e41ee2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java
@@ -18,10 +18,10 @@
 
     @Schema(description = "涓婚敭")
     @TableId(type = IdType.AUTO)
-    private Long id;
+    private Integer id;
 
     @Schema(description = "閮ㄩ棬ID")
-    private Long deptId;
+    private Integer deptId;
 
     @Schema(description = "鐢ㄦ埛璐﹀彿")
     private String account;

--
Gitblit v1.9.3