From 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 05 六月 2021 23:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java
index 84cc6e2..34d8013 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java
@@ -11,6 +11,7 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 编辑表单
@@ -76,6 +77,8 @@
     @ApiModelProperty(value = "围栏数据", hidden = false, example = "")
     private String data;
 
+    @ApiModelProperty(value = "网格员ID", hidden = false, example = "[12,45]")
+    private List<Long> gridMemebers;
 
     @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
     private Long userId;

--
Gitblit v1.7.1