From f193d5d14359b882af1ec10daf03dd69b04753b7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 29 Mar 2024 20:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java |    9 +++++++++
 1 files changed, 9 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 7084aca..36ffb07 100644
--- a/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java
+++ b/src/main/java/org/springblade/modules/discuss/excel/UserTopicsExcel.java
@@ -40,9 +40,18 @@
 	@ExcelProperty( "小区")
 	private String aoiName;
 
+	@ExcelProperty( "面积")
+	private String area;
+
+	@ExcelProperty( "地块")
+	private String remark;
+
 	@ExcelProperty( "投票项")
 	private String optionContent;
 
+	@ExcelProperty( "houseCode")
+	private String houseCode;
+
 
 	@ExcelProperty(value = "创建时间")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

--
Gitblit v1.9.3