From a09e361bfcb68a809e9143eca87bed2d66af2216 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Nov 2024 11:35:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/yw/entity/EmergencySpaceEntity.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/yw/entity/EmergencySpaceEntity.java b/src/main/java/org/springblade/modules/yw/entity/EmergencySpaceEntity.java
index aacbf1e..5c84944 100644
--- a/src/main/java/org/springblade/modules/yw/entity/EmergencySpaceEntity.java
+++ b/src/main/java/org/springblade/modules/yw/entity/EmergencySpaceEntity.java
@@ -35,6 +35,12 @@
 	 */
 	@ApiModelProperty(value = "应急空间名称")
 	private String name;
+
+	/**
+	 * 应急空间名称-带企业名称
+	 */
+	@ApiModelProperty(value = "应急空间名称-带企业名称")
+	private String fullName;
 	/**
 	 * 类型 见字典
 	 */
@@ -118,4 +124,10 @@
 	@TableLogic
 	private Integer isDeleted;
 
+	/**
+	 * 空间坐标
+	 */
+	@ApiModelProperty(value = "空间坐标")
+	private String geom;
+
 }

--
Gitblit v1.9.3