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 | 76 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 39 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 18a8d66..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
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -22,49 +21,48 @@
@Accessors(chain = true)
public class BaseEntity implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 鎼滅储鍊�
- */
- @ApiModelProperty(value = "鎼滅储鍊�")
- @TableField(exist = false)
- private String searchValue;
+ /**
+ * 鎼滅储鍊�
+ */
+ @ApiModelProperty(value = "鎼滅储鍊�")
+ @TableField(exist = false)
+ private String searchValue;
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value = "鍒涘缓鑰�")
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
+ /**
+ * 鍒涘缓鑰�
+ */
+ @ApiModelProperty(value = "鍒涘缓鑰�")
+ @TableField(fill = FieldFill.INSERT)
+ private String createBy;
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
- /**
- * 鏇存柊鑰�
- */
- @ApiModelProperty(value = "鏇存柊鑰�")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
+ /**
+ * 鏇存柊鑰�
+ */
+ @ApiModelProperty(value = "鏇存柊鑰�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
- /**
- * 鏇存柊鏃堕棿
- */
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Date updateTime;
- /**
- * 璇锋眰鍙傛暟
- */
- @JsonIgnore
- @ApiModelProperty(value = "璇锋眰鍙傛暟")
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @ApiModelProperty(value = "璇锋眰鍙傛暟")
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
}
--
Gitblit v1.9.3