From b822ea020a6d4edec0d183af32532076cdca062c Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 09 May 2024 20:55:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java b/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java
index 42f0e0a..495d2d1 100644
--- a/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java
+++ b/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java
@@ -53,6 +53,10 @@
 	@ExcelProperty( "候选人")
 	private String optionContent;
 
+	@ExcelProperty(value = "投票时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date createTime;
+
 
 }
 

--
Gitblit v1.9.3