From 566e7986291e73051d30ee252b0ebf852b1577a7 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 02 Apr 2024 14:25:51 +0800
Subject: [PATCH] 娱乐场所标签新增180200

---
 src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 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..42f0e0a 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,25 +29,29 @@
 
 	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 = "创建时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private Date createTime;
 
 
 }

--
Gitblit v1.9.3