From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
index 5c5ceac..6a6c500 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java
@@ -56,6 +56,18 @@
private String patrolType;
/**
+ * 巡查领导id
+ */
+ @ApiModelProperty("巡查领导id")
+ private String patrolLeader;
+
+ /**
+ * 巡查领导名字
+ */
+ @ApiModelProperty("巡查领导名字")
+ private String patrolLeaderName;
+
+ /**
* 巡查人员，多个以逗号隔开
*/
@ApiModelProperty("巡查人员id，多个以逗号隔开")
@@ -104,6 +116,12 @@
private String remark;
/**
+ * 是否存在隐患（1是 、0否）
+ */
+ @ApiModelProperty("是否存在隐患（1是 、0否）")
+ private Integer isHiddenDanger;
+
+ /**
* 隐患名称
*/
@ApiModelProperty("隐患名称")
@@ -150,6 +168,12 @@
*/
@ApiModelProperty("风险等级（1.红色预警 2.橙色预警 3.黄色预警 4.蓝色预警）")
private String dangerLevel;
+
+ /**
+ * 是否立即整改（1是 、0否）
+ */
+ @ApiModelProperty("是否立即整改（1是 、0否）")
+ private Integer isRectifyImmediately;
/**
* 采取措施
@@ -256,6 +280,37 @@
private String patrolName;
/**
+ * 接班领导id
+ */
+ @ApiModelProperty("接班领导id")
+ private String successionLeader;
+
+ /**
+ * 接班领导名字
+ */
+ @ApiModelProperty("接班领导名字")
+ private String successionLeaderName;
+
+ /**
+ * 接班人员id
+ */
+ @ApiModelProperty("接班人员id")
+ private String successionPerson;
+
+ /**
+ * 接班人员名字
+ */
+ @ApiModelProperty("接班人员名字")
+ private String successionPersonName;
+
+ /**
+ * 接班时间
+ */
+ @ApiModelProperty("接班时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date successionTime;
+
+ /**
* 巡查类型
*/
public interface patrolType {
--
Gitblit v1.7.1