From e1feed4fb9f3a7722eb0cd646e73e6573bdfb6e1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 16 四月 2024 20:56:05 +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 | 6 ++++--
1 files changed, 4 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 9bb7b6f..e8923b1 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,7 +21,7 @@
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")
@@ -53,6 +53,7 @@
private String firstV;
private String creator;
+
@DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
@@ -62,6 +63,7 @@
private Date createTime;
private String lastModifier;
+
@DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
@@ -96,7 +98,7 @@
private Date ts;
/**
- * 鎵�鏈夌潃
+ * 鎵�鏈夎��
*/
private String owner;
--
Gitblit v1.9.3