From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/entity/HouseEntity.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
index 6799987..25986b1 100644
--- a/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/HouseEntity.java
@@ -99,7 +99,7 @@
 	 * 楼层
 	 */
 	@ApiModelProperty(value = "楼层")
-	private Integer floor;
+	private String floor;
 	/**
 	 * 幢
 	 */
@@ -125,6 +125,11 @@
 	 */
 	@ApiModelProperty(value = "图片URLS")
 	private String imageUrls;
+	/**
+	 * 网格id
+	 */
+	@ApiModelProperty(value = "网格id")
+	private Integer gridId;
 
 	/**
 	 * 创建人

--
Gitblit v1.9.3