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/EventGridMemberWarnLogVO.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogVO.java
index fe465ce..ba47e8c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventGridMemberWarnLogVO.java
@@ -1,11 +1,12 @@
 package com.panzhihua.common.model.vos.grid;
 
-import java.util.*;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  *
@@ -13,41 +14,40 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Data
 @ApiModel("网格员定时上报地理预警记录返回参数")
 public class EventGridMemberWarnLogVO {
 
     @ApiModelProperty(value = "主键ID")
-	private Long id;
+    private Long id;
 
     @ApiModelProperty(value = "网格所属街道")
-	private Long gridStreetId;
+    private Long gridStreetId;
 
     @ApiModelProperty(value = "网格所属社区ID")
-	private Long gridCommunityId;
+    private Long gridCommunityId;
 
     @ApiModelProperty(value = "网格ID")
-	private Long gridId;
+    private Long gridId;
 
     @ApiModelProperty(value = "网格名称")
-	private String gridName;
+    private String gridName;
 
     @ApiModelProperty(value = "网格员ID")
-	private Long gridMemberId;
+    private Long gridMemberId;
 
     @ApiModelProperty(value = "精度维度信息,逗号分割")
-	private String lngLat;
+    private String lngLat;
 
     @ApiModelProperty(value = "预警信息内容")
-	private String content;
+    private String content;
 
     @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;
 
 }

--
Gitblit v1.7.1