From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/vo/PlaceVO.java |   73 ++++++++++++++++++++++++++++++++++++
 1 files changed, 73 insertions(+), 0 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 2038ab3..1d7e289 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.place.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
 import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
 import org.springblade.modules.grid.vo.GridVO;
@@ -23,6 +24,7 @@
 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;
@@ -55,6 +57,9 @@
 	 */
 	private Integer addressType;
 
+	@ApiModelProperty(value = "确认标记 1：待审核  2：审核通过  3：审核不通过")
+	private Integer confirmFlag;
+
 	/**
 	 * 采集人姓名
 	 */
@@ -80,5 +85,73 @@
 	 */
 	private List<PlacePoiLabelVO> placePoiLabelVOList = new ArrayList<>();
 
+	/**
+	 * 街道名称
+	 */
+	private String townStreetName;
+	/**
+	 * 社区名称
+	 */
+	private String neiName;
+
+	/**
+	 * 社区编号
+	 */
+	private String neiCode;
+
+	/**
+	 * 网格名称
+	 */
+	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;
 
 }

--
Gitblit v1.9.3