From cd0cc8910180826a92451c44a55c2799d7cdca81 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 10 Nov 2023 17:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/vo/PlaceVO.java |   22 ++++++++++++++++++++++
 1 files changed, 22 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 bd74706..e227e1f 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -16,10 +16,17 @@
  */
 package org.springblade.modules.place.vo;
 
+import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
+import org.springblade.modules.grid.vo.GridVO;
 import org.springblade.modules.place.entity.PlaceEntity;
 import org.springblade.core.tool.node.INode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.modules.place.entity.PlacePoiLabel;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 场所表 视图实体类
@@ -49,5 +56,20 @@
 	 */
 	private Integer isPerfect;
 
+	/**
+	 * 门牌地址信息
+	 */
+	private DoorplateAddressEntity doorplateAddressEntity;
+
+	/**
+	 * 网格数据
+	 */
+	private GridVO grid;
+
+	/**
+	 * 场所标签关联表
+	 */
+	private List<PlacePoiLabelVO> placePoiLabelVOList = new ArrayList<>();
+
 
 }

--
Gitblit v1.9.3