From cf2e6ce54f82c61606a01f816f7cac8b3a967809 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 30 六月 2021 18:07:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
index e141fdd..974ee72 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java
@@ -32,7 +32,7 @@
private Long gridId;
@Max(127)
- @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件", hidden = false, example = "1", required = true)
+ @ApiModelProperty(value = "事件分类：1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群上报", hidden = false, example = "1", required = true)
@NotNull(message = "事件分类不能为空")
private Integer eventType;
@@ -92,6 +92,10 @@
@Length(max=100)
@ApiModelProperty(value = "网格员名字", hidden = false, example = "")
private String gridMemberName;
+
+ @Length(max=100)
+ @ApiModelProperty(value = "事件类型", hidden = false, example = "")
+ private String eventClazz;
@Length(max=20)
@@ -272,6 +276,8 @@
@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")
--
Gitblit v1.7.1