From 66ba435f80650b1b5d36910867233e41fc226efb Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sat, 13 Apr 2024 14:29:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/excel/PlaceExcel.java |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/excel/PlaceExcel.java b/src/main/java/org/springblade/modules/place/excel/PlaceExcel.java
index a1b6961..0215ef1 100644
--- a/src/main/java/org/springblade/modules/place/excel/PlaceExcel.java
+++ b/src/main/java/org/springblade/modules/place/excel/PlaceExcel.java
@@ -5,6 +5,8 @@
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
+import org.springblade.common.excel.ExcelDictConverter;
+import org.springblade.common.excel.ExcelDictItemLabel;
 
 import java.io.Serializable;
 
@@ -33,23 +35,37 @@
 	@ExcelProperty( "社区名称")
 	private String communityName;
 
-	/** 所属网格 */
-	@ExcelProperty( "所属网格")
+	/** 网格名称 */
+	@ExcelProperty( "网格名称")
 	private String gridName;
 
-	/** 房屋名称 */
-	@ExcelProperty( "详细地址")
-	private String houseName;
-
-	/** 姓名 */
+	/** 经营者 */
 	@ColumnWidth(15)
-	@ExcelProperty( "姓名")
+	@ExcelProperty( "经营者")
 	private String name;
 
-	/** 手机号 */
+	/** 联系电话 */
 	@ColumnWidth(15)
-	@ExcelProperty( "手机号")
+	@ExcelProperty( "联系电话")
 	private String phoneNumber;
 
+	/** 企业（店铺）名称 */
+	@ColumnWidth(25)
+	@ExcelProperty( "企业（店铺）名称")
+	private String placeName;
+
+	/** 九小场所类型 */
+	@ExcelProperty( value = "九小场所类型",converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "nineType")
+	private String nineType;
+
+	/** 标签分类代码 */
+	@ExcelProperty( "标签分类代码")
+	private String labelCode;
+
+	/** 备注 */
+	@ExcelProperty( "备注")
+	private String remark;
+
 }
 

--
Gitblit v1.9.3