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 | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 879417f..71befe4 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceEntity.java
@@ -44,6 +44,7 @@
@TableName("jczz_place")
@ApiModel(value = "Place对象", description = "场所表")
public class PlaceEntity implements Serializable {
+ private static final long serialVersionUID = 1L;
/**
* 主键
@@ -57,12 +58,19 @@
* 门牌地址编码
*/
@ApiModelProperty(value = "门牌地址编码")
- private String houseAddressCode;
+ private String houseCode;
+
+ /**
+ * 楼栋编码
+ */
+ @ApiModelProperty(value = "楼栋编码")
+ private String buildingCode;
/**
* 场所负责人（关联用户表信息）
*/
@ApiModelProperty(value = "场所负责人（关联用户表信息）")
- private String principal;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long principalUserId;
/**
* 场所名称
*/
@@ -90,6 +98,12 @@
private String imageUrls;
/**
+ * 网格id
+ */
+ @ApiModelProperty(value = "网格id")
+ private Integer gridId;
+
+ /**
* 创建人
*/
@JsonSerialize(using = ToStringSerializer.class)
--
Gitblit v1.9.3