From 03fef57e7e061148a5ced5c83f79c61a68f2ffa3 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 01 Apr 2024 11:57:51 +0800
Subject: [PATCH] 议事用户导出

---
 src/main/java/org/springblade/modules/discuss/excel/holdExcel.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/discuss/excel/householdExcel.java b/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
similarity index 83%
rename from src/main/java/org/springblade/modules/discuss/excel/householdExcel.java
rename to src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
index 827ae4c..55337bf 100644
--- a/src/main/java/org/springblade/modules/discuss/excel/householdExcel.java
+++ b/src/main/java/org/springblade/modules/discuss/excel/holdExcel.java
@@ -1,15 +1,14 @@
 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;
 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
@@ -20,7 +19,7 @@
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-public class householdExcel implements Serializable {
+public class holdExcel implements Serializable {
 
 	private static final long serialVersionUID = 2L;
 
@@ -31,7 +30,7 @@
 	private String phone;
 
 	@ExcelProperty( "地块")
-	private String remark;
+	private String districtName;
 
 	@ExcelProperty( "栋号")
 	private String building;
@@ -41,7 +40,7 @@
 
 
 	@ExcelProperty( "地址")
-	private String addressName;
+	private String houseName;
 
 //	@ExcelProperty( "小区")
 //	private String aoiName;
@@ -58,8 +57,9 @@
 	@ExcelProperty( "议事规则")
 	private String rulesOfProcedure;
 
-//	@ExcelProperty( "投票项")
-//	private String optionContent;
+	@ExcelProperty( "投票项")
+	@ExcelIgnore
+	private String optionContent;
 
 
 //	@ExcelProperty(value = "创建时间")

--
Gitblit v1.9.3