From 1d21a9673d47a186bd189d9cceaa6e2ea17d293d Mon Sep 17 00:00:00 2001 From: CeDo <cedoogle@gmail.com> Date: 星期二, 15 六月 2021 14:55:44 +0800 Subject: [PATCH] Merge branch 'test' --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java | 4 ++++ 1 files changed, 4 insertions(+), 0 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 4dca483..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 @@ -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