From a0f6c9c91b61503a97a17fe2ecc2775afb75fda1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 07 九月 2021 14:42:28 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComSwDangerReportVO.java | 88 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 42 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 ffecc4d..5c5ceac 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
@@ -1,15 +1,15 @@
package com.panzhihua.common.model.vos.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;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+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;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* @auther txb
@@ -38,20 +38,26 @@
private Long communityId;
/**
+ * 社区id
+ */
+ @ApiModelProperty("社区名称")
+ private String communityName;
+
+ /**
* 巡查时间
*/
@ApiModelProperty("巡查时间")
private String PatrolTime;
/**
- * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
- */
+ * (取字典表国家标准编码)巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)
+ */
@ApiModelProperty("巡查类型(1.防火巡查2.防汛巡查3.防疫巡查)，多条以逗号隔开")
private String patrolType;
/**
- * 巡查人员，多个以逗号隔开
- */
+ * 巡查人员，多个以逗号隔开
+ */
@ApiModelProperty("巡查人员id，多个以逗号隔开")
private String patrolPerson;
@@ -74,50 +80,50 @@
private String address;
/**
- * 巡查记录
- */
+ * 巡查记录
+ */
@ApiModelProperty("巡查记录")
private String recordContent;
/**
- * 发现记录
- */
+ * 发现记录
+ */
@ApiModelProperty("发现记录")
private String findRecord;
/**
- * 记录照片
- */
+ * 记录照片
+ */
@ApiModelProperty("记录照片")
private String recordPhoto;
/**
- * 备注
- */
+ * 备注
+ */
@ApiModelProperty("备注")
private String remark;
/**
- * 隐患名称
- */
+ * 隐患名称
+ */
@ApiModelProperty("隐患名称")
- private String dagerName;
+ private String dangerName;
/**
- * 排查时间
- */
+ * 排查时间
+ */
@ApiModelProperty("排查时间")
private String checkTime;
/**
- * 主体部门、单位或个人全称
- */
+ * 主体部门、单位或个人全称
+ */
@ApiModelProperty("主体部门、单位或个人全称")
private String unitName;
/**
- * 隐患简述
- */
+ * 隐患简述
+ */
@ApiModelProperty("隐患简述")
private String dagerDescription;
@@ -146,20 +152,20 @@
private String dangerLevel;
/**
- * 采取措施
- */
+ * 采取措施
+ */
@ApiModelProperty("采取措施")
private String takeSteps;
/**
- * 采取措施照片
- */
+ * 采取措施照片
+ */
@ApiModelProperty("采取措施照片")
private String stepsPhoto;
/**
- * 整改人员
- */
+ * 整改人员
+ */
@ApiModelProperty("整改人员")
private String rectifyPerson;
@@ -215,15 +221,15 @@
private String assignPersonName;
/**
- * 创建时间
- */
+ * 创建时间
+ */
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
/**
- * 更新时间
- */
+ * 更新时间
+ */
@ApiModelProperty("更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAt;
@@ -249,12 +255,10 @@
@ApiModelProperty("巡查人员名称")
private String patrolName;
-
-
/**
* 巡查类型
*/
- public interface patrolType{
+ public interface patrolType {
int huo = 1;
int xun = 2;
int yi = 3;
@@ -263,7 +267,7 @@
/**
* 是否
*/
- public interface isOk{
+ public interface isOk {
int yes = 1;
int no = 0;
}
--
Gitblit v1.7.1