From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java |   51 +++++++++++++++++++++------------------------------
 1 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java
index 53ad0b0..c87ed56 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventVisitingTasksAddDTO.java
@@ -1,17 +1,16 @@
 package com.panzhihua.common.model.dtos.grid;
 
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import org.hibernate.validator.constraints.Length;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-
 
 /**
  * 创建表单
@@ -20,7 +19,7 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Data
 @ApiModel("创建重点人群走访记录请求参数")
 public class EventVisitingTasksAddDTO {
@@ -37,11 +36,11 @@
     @ApiModelProperty(value = "网格员", hidden = false, example = "1")
     private Long gridMember;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
     private String gridMemberName;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
     private String gridMenberTele;
 
@@ -49,7 +48,7 @@
     @ApiModelProperty(value = "需走访人ID", hidden = false, example = "1")
     private Long visiterId;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "需走访人名字", hidden = false, example = "")
     private String visiterName;
 
@@ -57,11 +56,11 @@
     @ApiModelProperty(value = "需走访人员性别", hidden = false, example = "1")
     private Integer visiterSex;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "需走访人电话", hidden = false, example = "")
     private String visiterTele;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "需走访人居住地址", hidden = false, example = "")
     private String visiterAddress;
 
@@ -69,7 +68,7 @@
     @ApiModelProperty(value = "人员类型1吸毒2严重精神障碍3刑释人员4社区矫正人员", hidden = false, example = "1")
     private Integer visiterType;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "事件标题", hidden = false, example = "")
     private String eventTitle;
 
@@ -77,7 +76,7 @@
     @ApiModelProperty(value = "事件类型", hidden = false, example = "1")
     private Integer eventType;
 
-    @Length(max=500)
+    @Length(max = 500)
     @ApiModelProperty(value = "事件描述", hidden = false, example = "")
     private String eventDes;
 
@@ -85,16 +84,15 @@
     @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
     private Integer actOpara;
 
-    
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50")
     private Date happenTime;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "发生地点", hidden = false, example = "")
     private String happentAddress;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "发生的精度纬度信息(逗号隔开)", hidden = false, example = "")
     private String happentLatLng;
 
@@ -114,44 +112,37 @@
     @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
     private Long dellUserId;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
     private String dellUserName;
 
-    
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
     private Date dellDate;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
     private String dellDesc;
 
-    
     @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
     private Boolean invalid;
 
-    
     @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
     private Boolean urgent;
 
-    
     @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
     private Boolean urgentDell;
 
-    
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
     private Date submitDate;
 
-    
     @ApiModelProperty(value = "是否异常行为", hidden = false, example = "true")
     private Boolean exception;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "走访内容根据重点人员类型输入项不同,录入全部的表单内容数据", hidden = false, example = "")
     private String tableContentJson;
-
 
     @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
     private Long userId;

--
Gitblit v1.7.1