From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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 755ce99..d66686b 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
@@ -1,17 +1,17 @@
package com.ruoyi.common.core.domain;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
/**
* Entity鍩虹被
- *
+ *
* @author ruoyi
*/
@@ -29,20 +29,18 @@
private String createBy;
/** 鍒涘缓鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 鏇存柊鑰� */
private String updateBy;
/** 鏇存柊鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 澶囨敞 */
private String remark;
/** 璇锋眰鍙傛暟 */
- private Map<String, Object> params;
+ private Map<String, Object> params = new HashMap<>();
}
--
Gitblit v1.9.3