From 67b7fca6f21c2088a1887ba2027360efdb089c1c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 24 九月 2021 16:08:12 +0800
Subject: [PATCH] 代码合并冲突解决

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java
index 0535966..57d0071 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventMapGridVO.java
@@ -17,4 +17,7 @@
     @ApiModelProperty("网格名字")
     private String gridName;
 
+    @ApiModelProperty("网格社区id")
+    private Long gridCommunityId;
+
 }

--
Gitblit v1.7.1