From 7eedb5a250515610f1df1fa0730cf779f0525add Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 08 七月 2021 08:56:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java
index b379325..331dd2b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddAdminDTO.java
@@ -51,9 +51,12 @@
     @ApiModelProperty(value = "网格员id集合", hidden = false, example = "")
     private List<Long> memberIds;
 
-    @ApiModelProperty(value = "网格所属社区ID", hidden = true, example = "1")
+    @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
     private Long gridCommunityId;
 
+    @ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
+    private Long lcGridId;
+
     @ApiModelProperty(value = "当前登录用户id", hidden = true, example = "1")
     private Long userId;
 

--
Gitblit v1.7.1