From dd8aa15e284c9d4c0c858e22f4130d1785261e01 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期四, 10 三月 2022 09:17:40 +0800 Subject: [PATCH] Merge branch 'hemenkou_dev' into dev --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java index aa5cd90..f13f274 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java @@ -1,14 +1,15 @@ package com.panzhihua.common.model.vos.grid; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.math.BigDecimal; import java.util.Date; import java.util.List; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; @Data @ApiModel("管理后台-网格返回参数") @@ -45,4 +46,6 @@ private String lcGirdId; @ApiModelProperty(value = "关联市平台网格") private String lcGirdName; + @ApiModelProperty(value = "网格所属社区id") + private Long gridCommunityId; } -- Gitblit v1.7.1