From c7c38dfd96047930999bcd7cf62d18d6d8651108 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 04 六月 2021 18:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java | 3 ++-
1 files changed, 2 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..b02c0bc 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
@@ -6,6 +6,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
@Data
@ApiModel("管理后台-网格返回参数")
@@ -16,7 +17,7 @@
@ApiModelProperty(value = "网格名称")
private String gridName;
@ApiModelProperty(value = "网格员")
- private String gridMemberName;
+ private List<GridMemberAdminVO> gridMembers;
@ApiModelProperty(value = "网格描述")
private String remarks;
@ApiModelProperty(value = "网格面积")
--
Gitblit v1.7.1