From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java
index 9deb11e..9eff6a3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridDataAreaVO.java
@@ -1,13 +1,14 @@
package com.panzhihua.common.model.vos.grid;
+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 java.util.Date;
/**
*
@@ -15,73 +16,72 @@
* @version 1.0
* @since 1.0
* @date 2021-05-26
- * */
+ */
@Data
@ApiModel("网格数据")
public class EventGridDataAreaVO {
@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 = "区/县名称")
+ @ApiModelProperty(value = "区/县名称")
private String zoneName;
@ApiModelProperty(value = "网格所属街道")
- private Long gridStreetId;
+ private Long gridStreetId;
- @ApiModelProperty(value = "网格所属街道名称")
- private String gridStreetName;
+ @ApiModelProperty(value = "网格所属街道名称")
+ private String gridStreetName;
@ApiModelProperty(value = "网格所属社区ID")
- private Long gridCommunityId;
+ private Long gridCommunityId;
- @ApiModelProperty(value = "网格所属社区名称")
- private String gridCommunityName;
+ @ApiModelProperty(value = "网格所属社区名称")
+ private String gridCommunityName;
@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