From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java
index dbcf011..813d4b2 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceCheckVO.java
@@ -16,10 +16,20 @@
  */
 package org.springblade.modules.place.vo;
 
+import io.swagger.annotations.ApiModelProperty;
+import liquibase.pro.packaged.P;
+import liquibase.pro.packaged.S;
+import org.springblade.modules.grid.entity.GridPatrolRecordEntity;
+import org.springblade.modules.patrol.entity.PatrolRecord;
+import org.springblade.modules.patrol.vo.PatrolRecordVO;
 import org.springblade.modules.place.entity.PlaceCheckEntity;
 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;
 
 /**
  * 场所检查表 视图实体类
@@ -42,4 +52,60 @@
 	 */
 	private String endTime;
 
+
+	private List<PatrolRecord> patrolRecordVOList;
+
+	private List<PlacePoiLabelVO> placePoiLabelVOList ;
+
+	@ApiModelProperty(value = "场所名称", example = "")
+	private String placeName;
+
+	@ApiModelProperty(value = "场所地址", example = "")
+	private String location;
+
+	@ApiModelProperty(value = "负责人", example = "")
+	private String principal;
+
+	@ApiModelProperty(value = "网格名称", example = "")
+	private String gridName;
+
+	@ApiModelProperty(value = "负责人电话", example = "")
+	private String principalPhone;
+
+	@ApiModelProperty(value = "街道名称", example = "")
+	private String streetName;
+
+	@ApiModelProperty(value = "社区名称", example = "")
+	private String communityName;
+
+	@ApiModelProperty(value = "法人", example = "")
+	private String legalPerson;
+
+	@ApiModelProperty(value = "法人电话", example = "")
+	private String legalTel;
+
+	@ApiModelProperty(value = "检查人名称", example = "")
+	private String name;
+
+	@ApiModelProperty(value = "隐患数量", example = "")
+	private Integer number;
+
+	@ApiModelProperty(value = "九小类型", example = "")
+	private String nineType;
+
+	@ApiModelProperty(value = "是否九小", example = "")
+	private Integer isNine;
+
+	private Long jpid;
+
+	/**
+	 * 角色名称
+	 */
+	private String roleName;
+
+	/**
+	 * 社区编号
+	 */
+	private String communityCode;
+
 }

--
Gitblit v1.9.3