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/ComActEasyPhotoAddDTO.java |   48 +++++++++++++++++++++++++-----------------------
 1 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java
index a76470a..e3cf5c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java
@@ -1,17 +1,18 @@
 package com.panzhihua.common.model.dtos.grid;
 
+import java.util.Date;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+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,24 +21,28 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Data
 @ApiModel("创建社区活动 》随手拍请求参数")
 public class ComActEasyPhotoAddDTO {
 
-    @NotNull() @Max(9223372036854775807L)
+    @NotNull()
+    @Max(9223372036854775807L)
     @ApiModelProperty(value = "发起人id", hidden = false, example = "1")
     private Long sponsorId;
 
-    @NotBlank() @Length(max=100)
+    @NotBlank()
+    @Length(max = 100)
     @ApiModelProperty(value = "发生地址", hidden = false, example = "")
     private String happenAddr;
 
-    @NotBlank(message = "地址备注不能为空") @Length(max=100)
+    @NotBlank(message = "地址备注不能为空")
+    @Length(max = 100)
     @ApiModelProperty(value = "地址备注", hidden = false, example = "")
     private String addrRemark;
 
-    @NotNull() @Max(127)
+    @NotNull()
+    @Max(127)
     @ApiModelProperty(value = "状态 1待处理 2已处理", hidden = false, example = "1")
     private Integer status;
 
@@ -45,24 +50,23 @@
     @ApiModelProperty(value = "处理人id", hidden = false, example = "1")
     private Long handlerId;
 
-    
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "审核时间", hidden = false, example = "2021-05-01 18:05:50")
     private Date examineAt;
 
-    @Length(max=65535)
+    @Length(max = 65535)
     @ApiModelProperty(value = "详情", hidden = false, example = "")
     private String detail;
 
-    @Length(max=65535)
+    @Length(max = 65535)
     @ApiModelProperty(value = "图片路径列表,逗号分隔", hidden = false, example = "")
     private String photoPathList;
 
-    @Length(max=65535)
+    @Length(max = 65535)
     @ApiModelProperty(value = "处理结果", hidden = false, example = "")
     private String handleResult;
 
-    @Length(max=65535)
+    @Length(max = 65535)
     @ApiModelProperty(value = "处理结果,图片路径列表,逗号分隔", hidden = false, example = "")
     private String handlePhotoList;
 
@@ -78,16 +82,15 @@
     @ApiModelProperty(value = "是否需要反馈 0 不需要 1 需要", hidden = false, example = "1")
     private Integer isNeedFeedBack;
 
-    
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "反馈时间", hidden = false, example = "2021-05-01 18:05:50")
     private Date feedbackAt;
 
-    @Length(max=500)
+    @Length(max = 500)
     @ApiModelProperty(value = "驳回原因", hidden = false, example = "")
     private String rejectReason;
 
-    @Length(max=65535)
+    @Length(max = 65535)
     @ApiModelProperty(value = "封面图片", hidden = false, example = "")
     private String cover;
 
@@ -102,7 +105,6 @@
     @Max(127)
     @ApiModelProperty(value = "是否公示(0.否 1.是)", hidden = false, example = "1")
     private Integer isPublicity;
-
 
     @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
     private Long userId;

--
Gitblit v1.7.1