From c32613f43eda01150e5a011073308ee95690ec96 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 16 Apr 2024 13:40:39 +0800
Subject: [PATCH] 管理公约
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 2 ++
src/main/java/org/springblade/modules/discuss/excel/holdExcel.java | 8 +++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java b/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
index c8eca6b..1ca2bf4 100644
--- a/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
+++ b/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
@@ -5,10 +5,12 @@
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
+import java.util.Date;
/**
* HouseExcel
@@ -62,9 +64,9 @@
private String optionContent;
-// @ExcelProperty(value = "创建时间")
-// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-// private Date createTime;
+ @ExcelProperty(value = "投票时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
}
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index dd647d3..2422490 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -238,6 +238,8 @@
jh.building,
jh.house_name,
jh.district_name,
+ jut.create_time,
+ jh.area,
(
SELECT
group_concat( jt.id ) AS optionContent
--
Gitblit v1.9.3