From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java
index 0746b09..9fc20f2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java
@@ -17,7 +17,7 @@
/**
* villageId
*/
- @TableId(type = IdType.AUTO)
+ @TableId(value = "village_id",type = IdType.INPUT)
private Long villageId;
/**
* 街路巷
@@ -27,11 +27,11 @@
/**
* 门牌号
*/
- private Integer houseNum;
+ private String houseNum;
/**
* 小区（组）
*/
- private String group;
+ private String groupAt;
/**
* 创建时间
*/
@@ -42,12 +42,46 @@
/**
* 社区id
*/
- @TableId(type = IdType.AUTO)
private Long communityId;
/**
* 街道id
*/
- @TableId(type = IdType.AUTO)
private Long streetId;
+
+ /**
+ * 小区类型（1.城镇 2.农村 3.未知）
+ */
+ private Integer type;
+
+ /**(城镇)小区名字*/
+ private String name;
+ /**如果是城镇小区填写楼栋数量 */
+ private Integer buildSum;
+ /**(城镇)建筑年代*/
+ private Date buildYear;
+ /**(城镇)建筑类型*/
+ private Long buildType;
+ /**(城镇)是否存在物业公司*/
+ private String property;
+ /**(城镇)开发商*/
+ private String developers;
+ /**(城镇)小区总共居民数量/这户一共住了几口人*/
+ private Integer userSum;
+ /**图片*/
+ private String villageImages;
+ /**地址*/
+ private String address;
+ /**层次递归字段（省>市>区县>街道>社区>小区）*/
+ private String path;
+ /**经度*/
+ private String lng;
+ /**维度*/
+ private String lat;
+
+ /**
+ * 更新时间
+ */
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updateAt;
}
--
Gitblit v1.7.1