From e70053d772947e6e50cfa42f5a544a009699c4ac Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 04 八月 2021 17:31:38 +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 331dd2b..a7c1588 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
@@ -55,7 +55,10 @@
     private Long gridCommunityId;
 
     @ApiModelProperty(value = "市平台网格关联id", hidden = false, example = "")
-    private Long lcGridId;
+    private String lcGridId;
+
+    @ApiModelProperty(value = "市平台网格关联名称", hidden = false, example = "")
+    private String lcGridName;
 
     @ApiModelProperty(value = "当前登录用户id", hidden = true, example = "1")
     private Long userId;

--
Gitblit v1.7.1