From c636e6909b8ed1dc1dba18bceca2554d5adde7f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 21 一月 2022 18:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index 55655bf..9c7857a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -1,8 +1,9 @@
package com.ruoyi.common.core.domain;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -12,38 +13,56 @@
/**
* Entity鍩虹被
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
@Accessors(chain = true)
-public class BaseEntity implements Serializable
-{
+public class BaseEntity implements Serializable {
+
private static final long serialVersionUID = 1L;
- /** 鎼滅储鍊� */
+ /**
+ * 鎼滅储鍊�
+ */
+ @ApiModelProperty(value = "鎼滅储鍊�")
+ @TableField(exist = false)
private String searchValue;
- /** 鍒涘缓鑰� */
+ /**
+ * 鍒涘缓鑰�
+ */
+ @ApiModelProperty(value = "鍒涘缓鑰�")
+ @TableField(fill = FieldFill.INSERT)
private String createBy;
- /** 鍒涘缓鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
private Date createTime;
- /** 鏇存柊鑰� */
+ /**
+ * 鏇存柊鑰�
+ */
+ @ApiModelProperty(value = "鏇存柊鑰�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private String updateBy;
- /** 鏇存柊鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
- /** 澶囨敞 */
- private String remark;
-
- /** 璇锋眰鍙傛暟 */
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @ApiModelProperty(value = "璇锋眰鍙傛暟")
+ @TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
}
--
Gitblit v1.9.3