From 196ac84b6ec0dd05304dd6577f169f7fbf5fe726 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:13:18 +0800
Subject: [PATCH] merge
---
medicalWaste-common/src/main/java/com/sinata/common/entity/BaseModel.java | 53 ++++++++---------------------------------------------
1 files changed, 8 insertions(+), 45 deletions(-)
diff --git a/medicalWaste-common/src/main/java/com/sinata/common/entity/BaseModel.java b/medicalWaste-common/src/main/java/com/sinata/common/entity/BaseModel.java
index 37e49ea..d3c222f 100644
--- a/medicalWaste-common/src/main/java/com/sinata/common/entity/BaseModel.java
+++ b/medicalWaste-common/src/main/java/com/sinata/common/entity/BaseModel.java
@@ -4,14 +4,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
/**
* Entity基类
*
* @author ruoyi
*/
+@Data
public class BaseModel implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -19,22 +22,22 @@
/** 创建者 */
@ApiModelProperty(value = "记录创建人，前端忽略")
@TableField(value = "create_by", fill = FieldFill.INSERT)
- private String createBy;
+ private Long createBy;
/** 创建时间 */
@ApiModelProperty(value = "记录创建时间，前端忽略")
@TableField(value = "create_time", fill = FieldFill.INSERT)
- private LocalDateTime createTime;
+ private Date createTime;
/** 更新者 */
@ApiModelProperty(value = "记录修改人，前端忽略")
@TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
+ private Long updateBy;
/** 更新时间 */
@ApiModelProperty(value = "记录修改时间，前端忽略")
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
+ private Date updateTime;
/** 是否删除 0未删除 1已删除 */
@TableField("del_flag")
@@ -42,44 +45,4 @@
@TableLogic
private Integer delFlag;
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public LocalDateTime getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(LocalDateTime createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public LocalDateTime getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(LocalDateTime updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getDelFlag() {
- return delFlag;
- }
-
- public void setDelFlag(Integer delFlag) {
- this.delFlag = delFlag;
- }
}
--
Gitblit v1.7.1