From 64e6ac37d0bc034f849efa1d94792a7ef97c3adb Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 24 Dec 2024 16:48:00 +0800
Subject: [PATCH] 新增按前缀上传文件,相关查询修改

---
 src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java b/src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java
index 18a4be0..54a1eea 100644
--- a/src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java
+++ b/src/main/java/org/springblade/modules/yw/excel/EmergencySpaceExcel.java
@@ -22,12 +22,17 @@
 	private static final long serialVersionUID = 1L;
 
 	@ColumnWidth(20)
-	@ExcelProperty("应急空间名称*")
+	@ExcelProperty("应急空间名称")
 	private String name;
 
 	@ColumnWidth(20)
 	@ExcelProperty("企业名称")
 	private String firmName;
+
+	@ColumnWidth(20)
+	@ExcelProperty(value = "类型",converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "emergency_space_type")
+	private String type;
 
 	@ColumnWidth(20)
 	@ExcelProperty(value = "防控级别",converter = ExcelDictConverter.class)
@@ -45,7 +50,7 @@
 	@ExcelProperty("纬度")
 	private String lat;
 
-	@ExcelProperty("可用容量(立方米)或转输(处置)能力(立方米/小时)")
+	@ExcelProperty("可用容量(立方米)(应急池)")
 	private Double capacity;
 
 	@ExcelProperty("备注")

--
Gitblit v1.9.3