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/vos/grid/EventGridAdminVO.java |   44 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 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
new file mode 100644
index 0000000..81beb2b
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridAdminVO.java
@@ -0,0 +1,44 @@
+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 List<GridMemberAdminVO> gridMembers;
+    @ApiModelProperty(value = "网格描述")
+    private String remarks;
+    @ApiModelProperty(value = "网格面积")
+    private BigDecimal area;
+    @ApiModelProperty(value = "居住人口")
+    private Integer populationTotal = 0;
+    @ApiModelProperty(value = "创建时间")
+    private Date createAt;
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    @ApiModelProperty(value = "线条颜色")
+    private String lineColor;
+    @ApiModelProperty(value = "线条宽度")
+    private String lineBroadband;
+    @ApiModelProperty(value = "填充颜色")
+    private String fillColor;
+    @ApiModelProperty(value = "围栏数据")
+    private String data;
+    @ApiModelProperty(value = "所在社区")
+    private String communityName;
+}

--
Gitblit v1.7.1