From c969a25c0b8b96efe4223553499fbafe29d1b299 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 22 七月 2022 16:25:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java
index 3269f8b..42f6baa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataVO.java
@@ -1,14 +1,14 @@
package com.panzhihua.common.model.vos.grid;
-import java.util.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
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 com.fasterxml.jackson.annotation.JsonFormat;
/**
*
@@ -16,64 +16,63 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("区县/街道/社区/网格员网格数据管理返回参数")
public class EventGridDataVO {
@ApiModelProperty(value = "主键ID")
- @JsonSerialize(using = ToStringSerializer.class)
- private Long id;
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long id;
@ApiModelProperty(value = "类型，1、区县网格2街道网格3社区网格")
- private Long type;
+ private Long type;
@ApiModelProperty(value = "区/县ID")
- private Long zoneId;
+ private Long zoneId;
@ApiModelProperty(value = "网格所属街道")
- private Long gridStreetId;
+ private Long gridStreetId;
@ApiModelProperty(value = "网格所属社区ID")
- private Long gridCommunityId;
+ private Long gridCommunityId;
@ApiModelProperty(value = "网格名称")
- private String gridName;
+ private String gridName;
@ApiModelProperty(value = "所属图层")
- private Integer mapLevel;
+ private Integer mapLevel;
@ApiModelProperty(value = "面积")
- private String area;
+ private String area;
@ApiModelProperty(value = "线条颜色")
- private String lineColor;
+ private String lineColor;
@ApiModelProperty(value = "线条宽度")
- private String lineBroadband;
+ private String lineBroadband;
@ApiModelProperty(value = "填充颜色")
- private String fillColor;
+ private String fillColor;
@ApiModelProperty(value = "备注")
- private String remarks;
+ private String remarks;
@ApiModelProperty(value = "围栏数据")
- private String data;
+ private String data;
@ApiModelProperty(value = "创建人")
- private Long createBy;
+ private Long createBy;
@ApiModelProperty(value = "创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createAt;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
@ApiModelProperty(value = "修改人")
- private Long updateBy;
+ private Long updateBy;
@ApiModelProperty(value = "修改时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateAt;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
}
--
Gitblit v1.7.1