From ea4a0692cf4ec4b504961cb5b11f12e047e2cf48 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 17 Feb 2023 17:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/excel/IcPartyActivityExcel.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
index 9f54fc3b8f..4b52917350 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/IcPartyActivityExcel.java
@@ -19,8 +19,11 @@ package com.epmet.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 联建活动
  *
@@ -47,7 +50,8 @@ public class IcPartyActivityExcel {
 
     @ColumnWidth(20)
     @ExcelProperty(value = "活动时间")
-    private String activityTime;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date activityTime;
     /**
      * actId不为空小程序
      * 为空管理平台