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/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java
index f11402b..e25dbb5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridDataDO.java
@@ -1,14 +1,11 @@
 package com.panzhihua.service_grid.model.dos;
 
-import java.util.*;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.*;
 
+import lombok.Data;
 
 /**
  * 区县/街道/社区/网格员网格数据管理实体类
@@ -17,7 +14,7 @@
  * @version 1.0
  * @since 1.0
  * @date 2021-05-26
- * */
+ */
 @Data
 @TableName("event_grid_data")
 public class EventGridDataDO implements Serializable {
@@ -25,74 +22,74 @@
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键ID   列: id
+     * 主键ID 列: id
      */
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
     /**
-     * 类型,1、区县网格2街道网格3社区网格   列: type
+     * 类型,1、区县网格2街道网格3社区网格 列: type
      */
     private Long type;
     /**
-     * 区/县ID   列: zone_id
+     * 区/县ID 列: zone_id
      */
     private Long zoneId;
     /**
-     * 网格所属街道   列: grid_street_id
+     * 网格所属街道 列: grid_street_id
      */
     private Long gridStreetId;
     /**
-     * 网格所属社区ID   列: grid_community_id
+     * 网格所属社区ID 列: grid_community_id
      */
     private Long gridCommunityId;
     /**
-     * 网格名称   列: grid_name
+     * 网格名称 列: grid_name
      */
     private String gridName;
     /**
-     * 所属图层   列: map_level
+     * 所属图层 列: map_level
      */
     private Integer mapLevel;
     /**
-     * 面积   列: area
+     * 面积 列: area
      */
     private String area;
     /**
-     * 线条颜色   列: line_color
+     * 线条颜色 列: line_color
      */
     private String lineColor;
     /**
-     * 线条宽度   列: line_broadband
+     * 线条宽度 列: line_broadband
      */
     private String lineBroadband;
     /**
-     * 填充颜色   列: fill_color
+     * 填充颜色 列: fill_color
      */
     private String fillColor;
     /**
-     * 备注   列: remarks
+     * 备注 列: remarks
      */
     @TableField(fill = FieldFill.UPDATE)
     private String remarks;
     /**
-     * 围栏数据   列: data
+     * 围栏数据 列: data
      */
     private String data;
     /**
-     * 创建人   列: create_by
+     * 创建人 列: create_by
      */
     private Long createBy;
     /**
-     * 创建时间   列: create_at
+     * 创建时间 列: create_at
      */
     @TableField(fill = FieldFill.INSERT)
     private Date createAt;
     /**
-     * 修改人   列: update_by
+     * 修改人 列: update_by
      */
     private Long updateBy;
     /**
-     * 修改时间   列: update_at
+     * 修改时间 列: update_at
      */
     @TableField(fill = FieldFill.UPDATE)
     private Date updateAt;
@@ -100,7 +97,7 @@
     /**
      * 类型,1、区县网格2街道网格3社区网格
      */
-    public interface type{
+    public interface type {
         Long qx = 1L;
         Long jd = 2L;
         Long sq = 3L;

--
Gitblit v1.7.1