From b4bce8a0f39858bf7e15a5a0396d49903dcd09f8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 14 十一月 2022 11:21:48 +0800
Subject: [PATCH] 升级druid到最新版本1.2.14
---
src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java | 3 ++-
pom.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1366bb5..354ae3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<mybatis.spring.boot.starter.version>2.2.2</mybatis.spring.boot.starter.version>
<pagehelper.spring.boot.starter.version>1.4.5</pagehelper.spring.boot.starter.version>
<fastjson.version>2.0.16</fastjson.version>
- <druid.version>1.2.11</druid.version>
+ <druid.version>1.2.14</druid.version>
<commons.io.version>2.11.0</commons.io.version>
<commons.fileupload.version>1.4</commons.fileupload.version>
<commons.collections.version>3.2.2</commons.collections.version>
diff --git a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
index 03a14fc..1a7cf45 100644
--- a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
+++ b/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
@@ -6,6 +6,7 @@
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* Entity鍩虹被
@@ -38,7 +39,7 @@
private String remark;
/** 璇锋眰鍙傛暟 */
- @JsonIgnore
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;
public String getSearchValue()
--
Gitblit v1.9.3