作者 RuoYi

升级druid到最新版本1.2.14

@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> 18 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
19 <java.version>1.8</java.version> 19 <java.version>1.8</java.version>
20 <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version> 20 <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
21 - <druid.version>1.2.11</druid.version> 21 + <druid.version>1.2.14</druid.version>
22 <bitwalker.version>1.21</bitwalker.version> 22 <bitwalker.version>1.21</bitwalker.version>
23 <swagger.version>3.0.0</swagger.version> 23 <swagger.version>3.0.0</swagger.version>
24 <kaptcha.version>2.3.2</kaptcha.version> 24 <kaptcha.version>2.3.2</kaptcha.version>
@@ -6,6 +6,7 @@ import java.util.HashMap; @@ -6,6 +6,7 @@ import java.util.HashMap;
6 import java.util.Map; 6 import java.util.Map;
7 import com.fasterxml.jackson.annotation.JsonFormat; 7 import com.fasterxml.jackson.annotation.JsonFormat;
8 import com.fasterxml.jackson.annotation.JsonIgnore; 8 import com.fasterxml.jackson.annotation.JsonIgnore;
  9 +import com.fasterxml.jackson.annotation.JsonInclude;
9 10
10 /** 11 /**
11 * Entity基类 12 * Entity基类
@@ -38,7 +39,7 @@ public class BaseEntity implements Serializable @@ -38,7 +39,7 @@ public class BaseEntity implements Serializable
38 private String remark; 39 private String remark;
39 40
40 /** 请求参数 */ 41 /** 请求参数 */
41 - @JsonIgnore 42 + @JsonInclude(JsonInclude.Include.NON_EMPTY)
42 private Map<String, Object> params; 43 private Map<String, Object> params;
43 44
44 public String getSearchValue() 45 public String getSearchValue()