From 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 30 六月 2021 18:02:00 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java
index cd6bb44..5ef36b7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java
@@ -109,7 +109,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date propagandaTimeEnd;
- @Length(max=255)
+ @Length(max=500)
@ApiModelProperty(value = "事件描述", hidden = false, example = "")
private String eventDes;
@@ -119,7 +119,7 @@
private String propagandaObject;
- @Length(max=10)
+ @Length(max=8)
@ApiModelProperty(value = "宣传人数", hidden = false, example = "")
private String propagandaNum;
@@ -263,6 +263,9 @@
@ApiModelProperty(value = "修改人", hidden = false, example = "1")
private Long updateBy;
+ @ApiModelProperty(value = "撤销类型 1 网格员 2 社区", hidden = true, example = "1")
+ private Integer revokeType;
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "修改时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
private Date updateAtBegin;
@@ -276,4 +279,5 @@
@ApiModelProperty(value = "社区ID", hidden = true, example = "1")
private Long communityId;
+
}
--
Gitblit v1.7.1