From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001 From: linwe <872216996@qq.com> Date: Tue, 03 Sep 2024 09:46:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog --- src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 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 7084aca..495d2d1 100644 --- a/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java +++ b/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java @@ -1,5 +1,6 @@ package org.springblade.modules.discuss.excel; +import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; @@ -28,23 +29,31 @@ private static final long serialVersionUID = 2L; - @ExcelProperty( "姓名") + @ExcelProperty( "业主姓名") private String name; - @ExcelProperty( "手机号") + @ExcelProperty( "业主电话") private String phone; + + @ExcelProperty( "地块") + private String districtName; + + @ExcelProperty( "栋号") + private String building; + + @ExcelProperty( "房号") + private String room; @ExcelProperty( "地址") private String addressName; - @ExcelProperty( "小区") - private String aoiName; + @ExcelProperty( "面积") + private BigDecimal area; - @ExcelProperty( "投票项") + @ExcelProperty( "候选人") private String optionContent; - - @ExcelProperty(value = "创建时间") + @ExcelProperty(value = "投票时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; -- Gitblit v1.9.3