From 57dc08a1404b2fdf60e1ac2446eba9c7d8eca72f Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 10 一月 2024 14:07:26 +0800
Subject: [PATCH] 兴趣点动静态数据查询加入所属部门提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 e681ea0..0903dc2 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
@@ -4,6 +4,8 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -14,7 +16,7 @@
*
* @author ruoyi
*/
-@JsonInclude(JsonInclude.Include.NON_NULL)//璇ユ敞瑙ｈ繃婊や负绌虹殑瀛楁
+//@JsonInclude(JsonInclude.Include.NON_NULL)//璇ユ敞瑙ｈ繃婊や负绌虹殑瀛楁
public class BaseEntity implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -22,37 +24,47 @@
/** 鎼滅储鍊� */
@JsonIgnore
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String searchValue;
/** 鍒涘缓鑰� */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String createBy;
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private Date createTime;
/** 鏇存柊鑰� */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String updateBy;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private Date updateTime;
/** 澶囨敞 */
@ApiModelProperty(hidden = true)
+ @TableField(exist = false)
private String remark;
/** 璇锋眰鍙傛暟 */
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- @ApiModelProperty(value = "鍔ㄦ�佸弬鏁�", name = "params", notes = "鏍规嵁涓嶅悓鐨勬煡璇㈠瓧娈佃嚜鐢遍厤缃弬鏁�", required = true)
+ @TableField(exist = false)
private Map<String, Object> params;
- @ApiModelProperty(value = "椤电爜", name = "pageNum", notes = "椤电爜", required = true)
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private Integer pageNum;
- @ApiModelProperty(value = "椤靛ぇ灏�", name = "pageSize", notes = "椤靛ぇ灏�", required = true)
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private Integer pageSize;
public Integer getPageNum() {
--
Gitblit v1.9.3