From 68a42ee3b831e9f973c817a9792a79e5f0e4d9f3 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 03 三月 2025 09:10:10 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_cr
---
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