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/dtos/community/ComSwPatrolRecordAddDTO.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
index d105252..27b8b80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComSwPatrolRecordAddDTO.java
@@ -1,6 +1,5 @@
package com.panzhihua.common.model.dtos.community;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
@@ -8,7 +7,6 @@
import lombok.Data;
import java.io.Serializable;
-import java.util.Date;
/**
@@ -34,26 +32,7 @@
* 巡查时间
*/
@ApiModelProperty("巡查时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date PatrolTime;
-
- /**
- * 天气
- */
- @ApiModelProperty("天气")
- private String weather;
-
- /**
- * 温度
- */
- @ApiModelProperty("温度")
- private String temperature;
-
- /**
- * 风
- */
- @ApiModelProperty("风")
- private String wind;
+ private String PatrolTime;
/**
* (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
@@ -64,14 +43,26 @@
/**
* 巡查领导
*/
- @ApiModelProperty("巡查领导")
+ @ApiModelProperty("巡查领导id")
private String patrolLeader;
/**
* 巡查人员
*/
- @ApiModelProperty("巡查人员")
+ @ApiModelProperty("巡查人员id")
private String patrolPerson;
+
+ /**
+ * 巡查人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员名字，多个以逗号隔开")
+ private String pPersonName;
+
+ /**
+ * 巡查人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("巡查人员电话，多个以逗号隔开")
+ private String pPersonPhone;
/**
* 巡查地址
@@ -119,7 +110,7 @@
* 接班时间
*/
@ApiModelProperty("接班时间")
- private Date successionTime;
+ private String successionTime;
/**
* 是否存在隐患（1是 、0否）
@@ -131,13 +122,16 @@
* 隐患名称
*/
@ApiModelProperty("隐患名称")
+ private String dangerName;
+
+ @ApiModelProperty("原隐患名称")
private String dagerName;
/**
* 排查时间
*/
@ApiModelProperty("排查时间")
- private Date checkTime;
+ private String checkTime;
/**
* 主体部门、单位或个人全称
@@ -149,6 +143,9 @@
* 隐患简述
*/
@ApiModelProperty("隐患简述")
+ private String dangerDescription;
+
+ @ApiModelProperty("原隐患简述")
private String dagerDescription;
/**
@@ -172,9 +169,21 @@
/**
* 整改人员
*/
- @ApiModelProperty("整改人员")
+ @ApiModelProperty("整改人员id")
private String rectifyPerson;
+ /**
+ * 整改人员名字，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员名字，多个以逗号隔开")
+ private String dPersonName;
+
+ /**
+ * 整改人员电话，多个以逗号隔开
+ */
+ @ApiModelProperty("整改人员电话，多个以逗号隔开")
+ private String dPersonPhone;
+
/**
* 创建人
--
Gitblit v1.7.1