From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..9bb7b6f 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(
@@ -23,7 +24,7 @@
@TableId(value = "OID",type = IdType.ASSIGN_UUID)
private String oid;
- @TableField(value = "ID")
+ @TableField(value = "id")
private String id;
private String name;
@@ -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;
@@ -94,6 +95,9 @@
)
private Date ts;
+ /**
+ * 鎵�鏈夌潃
+ */
private String owner;
private String copyFromVersion;
@@ -108,7 +112,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