From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
index 041cc62..a1cac1a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/model/BaseModel.java
@@ -14,6 +14,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 public class BaseModel implements Serializable {
 	@JsonSerialize(
@@ -32,7 +33,7 @@
 	 * 绉熸埛ID
 	 * @TableField(value = "tenant_id")杩欓噷蹇呴』瑕佸啓锛屽苟涓斿繀椤绘槸瑕佸皬鍐欑殑
 	 */
-	@TableField(value = "tenant_id",exist = false)
+	@TableField(value = "tenant_id")
 	private String tenantId;
 
 	private String description;
@@ -108,7 +109,7 @@
 	private String secretGradeText;
 
 	@TableField(exist = false)
-	private Map<String, String> data;
+	private Map<String, String> data = new HashMap<>();
 
 	public BaseModel() {
 	}

--
Gitblit v1.9.3