From 5cc66034f6d2dba30d2132078b2730f1dd4abf86 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 31 七月 2021 21:00:56 +0800
Subject: [PATCH] 修改bug

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 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 0970844..bbd6b03 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,22 +1,26 @@
 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;
 
 @Data
 @ApiModel("管理后台-网格返回参数")
 public class EventGridAdminVO {
 
     @ApiModelProperty(value = "网格id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     @ApiModelProperty(value = "网格名称")
     private String gridName;
     @ApiModelProperty(value = "网格员")
-    private String gridMemberName;
+    private List<GridMemberAdminVO> gridMembers;
     @ApiModelProperty(value = "网格描述")
     private String remarks;
     @ApiModelProperty(value = "网格面积")
@@ -37,4 +41,10 @@
     private String data;
     @ApiModelProperty(value = "所在社区")
     private String communityName;
+    @ApiModelProperty(value = "关联市平台id")
+    private String lcGirdId;
+    @ApiModelProperty(value = "关联市平台网格")
+    private String lcGirdName;
+    @ApiModelProperty(value = "网格所属社区id")
+    private Long gridCommunityId;
 }

--
Gitblit v1.7.1