From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java b/src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java
index 8f58c6b..7da13b0 100644
--- a/src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java
+++ b/src/main/java/org/springblade/modules/taskPlaceRectification/dto/TaskPlaceRectificationDTO.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.ApiModelProperty;
import org.springblade.modules.patrol.entity.PatrolRecord;
+import org.springblade.modules.patrol.vo.PatrolRecordVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.taskPlaceRectification.entity.TaskPlaceRectificationEntity;
import lombok.Data;
@@ -35,8 +36,12 @@
@EqualsAndHashCode(callSuper = true)
public class TaskPlaceRectificationDTO extends TaskPlaceRectificationEntity {
private static final long serialVersionUID = 1L;
- private List<PatrolRecord> patrolRecordVOList;
+
+ @ApiModelProperty(value = "隐患项目", example = "")
+ private List<PatrolRecordVO> patrolRecordVOList;
+
+ @ApiModelProperty(value = "场所标签", example = "")
private List<PlacePoiLabelVO> placePoiLabelVOList ;
@ApiModelProperty(value = "场所名称", example = "")
@@ -72,5 +77,36 @@
@ApiModelProperty(value = "隐患数量", example = "")
private Integer number;
+ @ApiModelProperty(value = "机构名称", example = "")
+ private String deptName;
+
+ @ApiModelProperty(value = "九小场所类型 业务字典：nineType", example = "")
+ private String nineType;
+
+ @ApiModelProperty(value = "隐患问题", example = "")
+ private String hiddenDanger;
+
+ @ApiModelProperty(value = "不通过原因", example = "")
+ private String reasonFailure;
+
+ @ApiModelProperty(value = "地址编码", example = "")
+ private String addressName;
+
+ @ApiModelProperty(value = "开始时间", example = "")
+ private String startTime;
+
+ @ApiModelProperty(value = "结束时间", example = "")
+ private String endTime;
+
+ /**
+ * 角色名称
+ */
+ private String roleName;
+
+ /**
+ * 社区编号
+ */
+ private String communityCode;
+
}
--
Gitblit v1.9.3