From efdfc33415d43d2f97cdfa66a48e3713f6c2fd1a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 24 八月 2023 20:33:39 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
index aa2c7cb..31f92c6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
@@ -1,7 +1,9 @@
 package com.vci.ubcs.omd.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -36,6 +38,7 @@
 	 */
 	@ApiModelProperty(value = "涓婚敭")
 	@NotNull
+	@TableId
 	private String oid;
 
 	/**
@@ -168,6 +171,9 @@
 	 * 鏃堕棿鎴�
 	 */
 	@ApiModelProperty(value = "鏃堕棿鎴�")
+	@JsonFormat(
+		pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+	)
 	private Date ts;
 
 	/**

--
Gitblit v1.9.3