From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java |   47 ++++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
index 2d89ae9..85ee345 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
@@ -1,17 +1,19 @@
 package com.panzhihua.common.model.dtos.grid;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.URL;
+import java.util.Date;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.URL;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * 创建表单
@@ -20,30 +22,28 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Data
 @ApiModel("宣传教育事件请求参数")
 public class PublicityEventAddDTO {
-
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "宣传时间", hidden = false, example = "2021-05-01 18:05:50")
     @NotNull(message = "宣传时间不能为空")
     private Date propagandaTime;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "宣传地点-精度纬度信息(逗号隔开)", hidden = false, example = "41.40338,2.17403", required = true)
     @NotNull(message = "宣传地点不能为空")
     private String happentLatLng;
 
-    @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 = "", required = true)
     private String happenAddress;
-
 
     @Max(9223372036854775807L)
     @ApiModelProperty(value = "宣传区域-网格ID", hidden = false, example = "1", required = true)
@@ -52,44 +52,45 @@
 
     @Max(9223372036854775807L)
     @ApiModelProperty(value = "上报人ID", hidden = false, example = "1", required = true)
-    //@NotNull(message = "上报人不能为空")
+    // @NotNull(message = "上报人不能为空")
     private Long gridMemberId;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "宣传主题", hidden = false, example = "", required = true)
     @NotNull(message = "宣传主题不能为空")
     private String eventTitle;
 
-    @Length(max=500)
+    @Length(max = 500)
     @ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
     @NotNull(message = "宣传内容不能为空")
     private String eventDes;
 
-    @Length(max=255)
+    @Length(max = 255)
     @ApiModelProperty(value = "宣传类型", hidden = false, example = "1", required = true)
     @NotNull(message = "宣传类型不能为空")
     private String propagandaType;
 
-
-    @Length(max=50)
+    @Length(max = 50)
     @ApiModelProperty(value = "宣传对象", hidden = false, example = "", required = true)
     @NotNull(message = "宣传对象不能为空")
     private String propagandaObject;
 
     @Min(1)
-    @Length(max=8)
+    @Length(max = 8)
     @ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
     @NotNull(message = "宣传人数不能为空")
     private String propagandaNum;
 
-    @ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
+    @ApiModelProperty(value = "音频(限1个)", hidden = false,
+        example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
     @URL
     private String audio;
 
     @ApiModelProperty(value = "音频时长(单位:秒)", hidden = false, example = "10")
     private Integer audioTime;
 
-    @ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
+    @ApiModelProperty(value = "视频(限1个)", hidden = false,
+        example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
     @URL
     private String video;
 
@@ -97,7 +98,7 @@
     private Integer videoTime;
 
     @ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
-            example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
+        example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
     private String pics;
 
     @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")

--
Gitblit v1.7.1