From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/entity/PlaceEntity.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
index 35e8b0d..71befe4 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -58,22 +58,24 @@
 	 * 门牌地址编码
 	 */
 	@ApiModelProperty(value = "门牌地址编码")
+	private String houseCode;
+
+	/**
+	 * 楼栋编码
+	 */
+	@ApiModelProperty(value = "楼栋编码")
 	private String buildingCode;
 	/**
 	 * 场所负责人（关联用户表信息）
 	 */
 	@ApiModelProperty(value = "场所负责人（关联用户表信息）")
-	private String principal;
+	@JsonSerialize(using = ToStringSerializer.class)
+	private Long principalUserId;
 	/**
 	 * 场所名称
 	 */
 	@ApiModelProperty(value = "场所名称")
 	private String placeName;
-	/**
-	 * 标签
-	 */
-	@ApiModelProperty(value = "标签")
-	private String label;
 	/**
 	 * 经度
 	 */
@@ -96,6 +98,12 @@
 	private String imageUrls;
 
 	/**
+	 * 网格id
+	 */
+	@ApiModelProperty(value = "网格id")
+	private Integer gridId;
+
+	/**
 	 * 创建人
 	 */
 	@JsonSerialize(using = ToStringSerializer.class)

--
Gitblit v1.9.3