From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/GridBuildRelationDO.java |   66 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/GridBuildRelationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/GridBuildRelationDO.java
index 0ce42ac..d3740dd 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/GridBuildRelationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/GridBuildRelationDO.java
@@ -1,42 +1,44 @@
 package com.panzhihua.service_community.model.dos;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
 /**
- * Description  网格和建筑或楼栋关联表
- * ClassName    GridBuildRelation
- * @author      manailin
+ * Description 网格和建筑或楼栋关联表 ClassName GridBuildRelation
+ * 
+ * @author manailin
  */
- @Data
- @TableName(value = "event_grid_building_relation")
+@Data
+@TableName(value = "event_grid_building_relation")
 public class GridBuildRelationDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	/**主键*/
-	@TableId(value = "id",type = IdType.INPUT)
-	private Long id;
-	/**网格所属街道*/
-	private Long gridStreetId;
-	/**网格所属社区ID*/
-	private Long gridCommunityId;
-	/**网格ID*/
-	private Long gridId;
-	/**网格名称*/
-	private String gridName;
-	/**小区类型(1.城镇 2.农村 3.未知)*/
-	private Integer type;
-	/**小区表ID*/
-	private Long villageId;
-	/**楼栋ID*/
-	private Long buildId;
-	private String buildName;
-	/**创建人*/
-	private Long createBy;
-	/**创建时间*/
-	private Date createAt;
+    private static final long serialVersionUID = 1L;
+    /** 主键 */
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
+    /** 网格所属街道 */
+    private Long gridStreetId;
+    /** 网格所属社区ID */
+    private Long gridCommunityId;
+    /** 网格ID */
+    private Long gridId;
+    /** 网格名称 */
+    private String gridName;
+    /** 小区类型(1.城镇 2.农村 3.未知) */
+    private Integer type;
+    /** 小区表ID */
+    private Long villageId;
+    /** 楼栋ID */
+    private Long buildId;
+    private String buildName;
+    /** 创建人 */
+    private Long createBy;
+    /** 创建时间 */
+    private Date createAt;
 
 }

--
Gitblit v1.7.1