From 51508c8c63bb072739a0e3ae45cb11e7599c8f66 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 20 八月 2021 10:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 44b07d3..2d89ae9 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
@@ -8,6 +8,7 @@
import org.hibernate.validator.constraints.URL;
import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.Date;
@@ -39,17 +40,27 @@
@ApiModelProperty(value = "发生地点-位置备注", hidden = false, example = "")
private String happentAddress;
+ @Length(max=255)
+ @ApiModelProperty(value = "事件发生地点", hidden = false, example = "", required = true)
+ private String happenAddress;
+
+
@Max(9223372036854775807L)
@ApiModelProperty(value = "宣传区域-网格ID", hidden = false, example = "1", required = true)
@NotNull(message = "宣传区域不能为空")
private Long gridId;
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "上报人ID", hidden = false, example = "1", required = true)
+ //@NotNull(message = "上报人不能为空")
+ private Long gridMemberId;
@Length(max=255)
@ApiModelProperty(value = "宣传主题", hidden = false, example = "", required = true)
@NotNull(message = "宣传主题不能为空")
private String eventTitle;
- @Length(max=255)
+ @Length(max=500)
@ApiModelProperty(value = "宣传内容", hidden = false, example = "", required = true)
@NotNull(message = "宣传内容不能为空")
private String eventDes;
@@ -65,7 +76,8 @@
@NotNull(message = "宣传对象不能为空")
private String propagandaObject;
- @Length(max=10)
+ @Min(1)
+ @Length(max=8)
@ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
@NotNull(message = "宣传人数不能为空")
private String propagandaNum;
--
Gitblit v1.7.1