From 2ef77429e8906bdfec24bfb6fbc07509bd6ea855 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 九月 2023 10:32:11 +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 | 7 +++++--
1 files changed, 5 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 a1cac1a..4647cee 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
@@ -21,10 +21,10 @@
using = ToStringSerializer.class
)
@ApiModelProperty("涓婚敭id")
- @TableId(value = "OID",type = IdType.ASSIGN_UUID)
+ @TableId(value = "OID",type = IdType.ASSIGN_ID)
private String oid;
- @TableField(value = "ID")
+ @TableField(value = "id")
private String id;
private String name;
@@ -95,6 +95,9 @@
)
private Date ts;
+ /**
+ * 鎵�鏈夌潃
+ */
private String owner;
private String copyFromVersion;
--
Gitblit v1.9.3