From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
index e1edb79..e036c32 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java
@@ -214,6 +214,13 @@
@ApiModelProperty("安全记录/隐患报告显示按钮（1.查看安全工作记录 2.隐患报告待填写 3.查看隐患报告）")
private Integer displayButton;
+ @ApiModelProperty("隐患/安全记录id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long serviceId;
+
+ @ApiModelProperty("隐患or安全记录（1.隐患 2.安全记录）")
+ private Integer dangerOrRecord;
+
/**
* 巡查类型
*/
--
Gitblit v1.7.1