From 8ae8c5498da43d15e8fc511c7534fc9ff4a9c750 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 14 一月 2023 00:58:30 +0800
Subject: [PATCH] fix 修复 多数据源适配 jakarta 异常 bug (临时)
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 9c7857a..1917800 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,10 +2,11 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
-import lombok.experimental.Accessors;
+import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
@@ -18,50 +19,46 @@
*/
@Data
-@Accessors(chain = true)
public class BaseEntity implements Serializable {
+ @Serial
private static final long serialVersionUID = 1L;
/**
* 鎼滅储鍊�
*/
- @ApiModelProperty(value = "鎼滅储鍊�")
+ @JsonIgnore
@TableField(exist = false)
private String searchValue;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField(fill = FieldFill.INSERT)
private String createBy;
/**
* 鍒涘缓鏃堕棿
*/
- @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 Date updateTime;
/**
* 璇锋眰鍙傛暟
*/
- @ApiModelProperty(value = "璇锋眰鍙傛暟")
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
@TableField(exist = false)
private Map<String, Object> params = new HashMap<>();
--
Gitblit v1.9.3