From 72f11c9e9edec3d2534112badf7a0ca48fa9da5a Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 23 六月 2021 14:37:44 +0800
Subject: [PATCH] Merge branch 'test' into 'test_wangge_two'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 4da7d28..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
@@ -29,7 +29,7 @@
@NotNull(message = "网格ID不能为空")
private Long gridId;
- @Max(value = 6, message = "事件处理状态参数错误")
+ @Max(value = 8, message = "事件处理状态参数错误")
@ApiModelProperty(value = "事件处理状态（为空时查询全部）：1 已发布、5 草稿箱、6已撤销", hidden = false, example = "1")
private Integer eventDealStatus;
@@ -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;
@@ -252,7 +252,6 @@
@ApiModelProperty(value = "创建人", hidden = false, example = "1")
private Long createBy;
-
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间-开始时间", hidden = false, example = "2021-05-01 18:05:50")
private Date createAtBegin;
@@ -260,19 +259,25 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAtEnd;
-
@Max(9223372036854775807L)
@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;
+
@ApiModelProperty(value = "修改时间-结束时间", hidden = false, example = "2021-05-01 18:05:50")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateAtEnd;
+
@ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
private Long userId;
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
+
}
--
Gitblit v1.7.1