From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/User.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..3b9d9c7 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
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -18,10 +19,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;
@@ -83,7 +84,7 @@
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
+ private LocalDateTime createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value = "鏇存柊鑰�")
@@ -96,5 +97,8 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ @ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�")
+ private String companyId;
+
}
--
Gitblit v1.9.3