From 82213e51f923c464e0eea652ace934a0aa26fac9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 02 十二月 2025 10:04:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
index 3d58cfd..5a23f29 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/WarningEvent.java
@@ -32,7 +32,7 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     //@ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")

--
Gitblit v1.9.3