From ac0f1610e21b5326d4c7c263aa5cf410d9e2465c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 16 八月 2021 16:22:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwPatrolRecordVO.java | 4 ++++
1 files changed, 4 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 ed638d9..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
@@ -215,8 +215,12 @@
private Integer displayButton;
@ApiModelProperty("隐患/安全记录id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long serviceId;
+ @ApiModelProperty("隐患or安全记录（1.隐患 2.安全记录）")
+ private Integer dangerOrRecord;
+
/**
* 巡查类型
*/
--
Gitblit v1.7.1