From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 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 d1ad296..bd31607 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,8 @@
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 java.io.Serializable;
@@ -24,42 +25,38 @@
/**
* 鎼滅储鍊�
*/
- @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