From b642788dda56b058e2a4c40a9c43e29a5db85865 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 09:35:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
index b8e76c9..d02faa7 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
@@ -19,11 +19,13 @@
 import com.baomidou.mybatisplus.annotation.IdType;
 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 lombok.Data;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,7 +37,7 @@
  * @since 2023-04-04
  */
 @Data
-@TableName("PL_CODE_SYNONYM")
+@TableName(CodeTableNameConstant.PL_CODE_SYNONYM)
 @ApiModel(value = "PlCodeSynonym瀵硅薄", description = "杩戜箟璇嶇淮鎶�")
 //@EqualsAndHashCode(callSuper = true)
 public class CodeSynonymEntity implements Serializable {
@@ -150,6 +152,9 @@
 	 *
 	 */
 	@ApiModelProperty(value = "")
+	@JsonFormat(
+		  pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+	)
 	private Date ts;
 	/**
 	 * 鎵�灞炶涓氬悕绉�

--
Gitblit v1.9.3