From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
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 29d18a7..eb50fe3 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 @@
@ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
- private Long id;
+ private Integer id;
@ApiModelProperty(value = "閮ㄩ棬ID")
- private Long deptId;
+ private Integer deptId;
@ApiModelProperty(value = "鐢ㄦ埛璐﹀彿")
private String account;
--
Gitblit v1.9.3