From bfedaf0182cac8fb947f1b0a3dee3d07c3c24f1e Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 21 七月 2023 19:33:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
index aedc1bf..252c933 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
@@ -1,5 +1,7 @@
package com.vci.ubcs.omd.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.Map;
@@ -48,7 +50,10 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
- private Date ts;
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
+ private Date ts;
/**
* 绫荤殑鍏ㄨ矾寰�
--
Gitblit v1.9.3