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 | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 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 03c27cd..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
@@ -48,26 +48,8 @@
* 巡查时间
*/
@ApiModelProperty("巡查时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date patrolTime;
-
- /**
- * 天气
- */
- @ApiModelProperty("天气")
- private String weather;
-
- /**
- * 温度
- */
- @ApiModelProperty("温度")
- private String temperature;
-
- /**
- * 风
- */
- @ApiModelProperty("风")
- private String wind;
/**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
@@ -86,6 +68,18 @@
*/
@ApiModelProperty("巡查人员")
private String patrolPerson;
+
+ /**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String personName;
+
+ /**
+ * 巡查人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员电话，多个以逗号隔开")
+ private String personPhone;
/**
* 巡查地址
@@ -133,6 +127,7 @@
* 接班时间
*/
@ApiModelProperty("接班时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date successionTime;
/**
@@ -151,6 +146,7 @@
* 排查时间
*/
@ApiModelProperty("排查时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date checkTime;
/**
@@ -209,12 +205,22 @@
@ApiModelProperty("创建人")
private Long createBy;
+ @ApiModelProperty("填报人名称")
+ private String createName;
+
/**
* 安全记录/隐患报告显示按钮
*/
@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