From 1a47d5fe54230e312aa8486aad7fb30ada1f7b2b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 06 Dec 2023 09:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/excel/HouseHoldExcel.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/excel/HouseHoldExcel.java b/src/main/java/org/springblade/modules/house/excel/HouseHoldExcel.java
index 74bfac9..37261a5 100644
--- a/src/main/java/org/springblade/modules/house/excel/HouseHoldExcel.java
+++ b/src/main/java/org/springblade/modules/house/excel/HouseHoldExcel.java
@@ -5,6 +5,7 @@
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springblade.common.excel.ExcelDictConverter;
import org.springblade.common.excel.ExcelDictItem;
@@ -25,6 +26,13 @@
public class HouseHoldExcel implements Serializable {
private static final long serialVersionUID = 2L;
+
+ /**
+ * 门牌地址编码
+ */
+ @ColumnWidth(25)
+ @ExcelProperty( "门牌地址编码")
+ private String houseCode;
/** 姓名 */
@ColumnWidth(15)
@@ -150,7 +158,7 @@
@ColumnWidth(15)
@ExcelProperty( value = "是否党员",converter = ExcelDictConverter.class)
@ExcelDictItem(type = "partyEmberType")
- private Integer partyEmber;
+ private String partyEmber;
/** 备注 */
@ColumnWidth(15)
--
Gitblit v1.9.3