From b3c3afc2b4af331bbd6ac60f16be9fd6563f7ca0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 15 十二月 2021 14:12:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java |    2 --
 1 files changed, 0 insertions(+), 2 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..b218070 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;
@@ -62,7 +61,6 @@
 	/**
 	 * 璇锋眰鍙傛暟
 	 */
-	@JsonIgnore
 	@ApiModelProperty(value = "璇锋眰鍙傛暟")
 	@TableField(exist = false)
 	private Map<String, Object> params = new HashMap<>();

--
Gitblit v1.9.3