Merge branch 'test_future_wangge' into test

CeDo

2021-06-03 165f5d0ce0ee16bdce2b8af55ce4aa6383af6382

 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;