From 8ef6cc463ec3e1c7f7164bcfe19c383214cb5db4 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 11 七月 2022 09:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_zts
---
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