From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/entity/HouseEntity.java |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 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..9782c79 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,43 @@
 	 */
 	@ApiModelProperty(value = "图片URLS")
 	private String imageUrls;
+
+	/**
+	 * 经度
+	 */
+	private String lng;
+
+	/**
+	 * 纬度
+	 */
+	private String lat;
+
+	/**
+	 * 地址
+	 */
+	private String address;
+	/**
+	 * 网格id
+	 */
+	@ApiModelProperty(value = "网格id")
+	private Integer gridId;
+	/**
+	 * 网格编号
+	 */
+	@ApiModelProperty(value = "网格编号")
+	private String gridCode;
+
+	/**
+	 * 警务网格编号
+	 */
+	@ApiModelProperty(value = "警务网格编号")
+	private String jwGridCode;
+
+	/**
+	 * 来源 1:地址总表  2:国控采集
+	 */
+	@ApiModelProperty(value = "来源 1:地址总表  2:国控采集")
+	private Integer source;
 
 	/**
 	 * 创建人
@@ -169,4 +206,10 @@
 	@ApiModelProperty("是否已删除 0:否  1:是")
 	private Integer isDeleted;
 
+	/**
+	 * 房产证图片
+	 */
+	@ApiModelProperty(value = "房产证图片")
+	private String propertyCertificateImg;
+
 }

--
Gitblit v1.9.3