From 9269fc94626bd9ed8c6c3d9e021d37b22d86a665 Mon Sep 17 00:00:00 2001 From: linwei <872216696@qq.com> Date: Thu, 22 Feb 2024 17:16:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/modules/place/excel/PlaceCheckExcel.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springblade/modules/place/excel/PlaceCheckExcel.java b/src/main/java/org/springblade/modules/place/excel/PlaceCheckExcel.java index 00669b6..3518683 100644 --- a/src/main/java/org/springblade/modules/place/excel/PlaceCheckExcel.java +++ b/src/main/java/org/springblade/modules/place/excel/PlaceCheckExcel.java @@ -5,6 +5,9 @@ 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.ExcelDictItem; + import java.io.Serializable; /** @@ -21,7 +24,15 @@ private static final long serialVersionUID = 2L; - /** 街道名称 */ + @ExcelProperty( value = "场所名称") + private String placeName; + + @ExcelProperty(value = "场所地址") + private String location; + + @ExcelProperty( value = "场所类别") + private String nineType; + @ExcelProperty( "所属街道") private String streetName; @@ -31,9 +42,6 @@ @ExcelProperty(value = "所属网格") private String gridName; - @ExcelProperty( value = "场所名称") - private String placeName; - @ExcelProperty( value = "场所隐患") private String remark; @@ -42,9 +50,6 @@ @ExcelProperty(value = "场所负责人电话") private String principalPhone; - - @ExcelProperty(value = "场所地址") - private String location; @ExcelProperty(value = "创建时间") private String createTime; -- Gitblit v1.9.3