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/place/vo/PlaceVO.java |   67 +++++++++++++++++++++++++++++++--
 1 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
index fae4cc9..55d83e2 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -24,10 +24,13 @@
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.modules.place.entity.PlaceExtEntity;
 import org.springblade.modules.place.entity.PlacePoiLabel;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 场所表 视图实体类
@@ -47,10 +50,7 @@
 
 	private String phone;
 
-	/**
-	 * 角色名称
-	 */
-	private String roleName;
+
 	/**
 	 * 类型 2：非小区（能关联地址表）  3：商超
 	 */
@@ -103,5 +103,64 @@
 	 */
 	private String gridName;
 
+	/**
+	 * 区域编号
+	 */
+	private String regionCode;
+
+	/**
+	 * 详情id(维护)
+	 */
+	private Long placeExtId;
+
+	/**
+	 * 门牌地址信息
+	 */
+	private PlaceExtEntity placeExtEntity;
+
+	/**
+	 * 颜色
+	 */
+	private String color;
+
+	/**
+	 * 网格id
+	 */
+	private Integer gridId;
+
+	/**
+	 * 采集人实时经度
+	 */
+	private String x;
+
+	/**
+	 * 采集人实时纬度
+	 */
+	private String y;
+
+	@ApiModelProperty(value = "警察名称")
+	private String policeName;
+
+	@ApiModelProperty(value = "警察电话")
+	private String policePhone;
+
+	@ApiModelProperty(value = "机构名称")
+	private String deptName;
+	@ApiModelProperty(value = "地址")
+	private String addressName;
+	/**
+	 * 社区编号
+	 */
+	private String communityCode;
+
+	/**
+	 * 角色名称
+	 */
+	private String roleName;
+
+	/**
+	 * 房屋绑定
+	 */
+	private List<Map<String,Object>> houseBindList = new ArrayList<>();
 
 }

--
Gitblit v1.9.3