From c8cdec5a84e86c35fbe7d18ca8eefbe5cbf11ba7 Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期二, 08 八月 2023 18:11:57 +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 | 8 ++++++-- 1 files changed, 6 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 c8c9754..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; @@ -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