From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngVillageDO.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 18e654b..a26e80e 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
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@@ -17,7 +19,8 @@
/**
* villageId
*/
- @TableId(type = IdType.AUTO)
+ @TableId(value = "village_id",type = IdType.INPUT)
+ @JsonSerialize(using = ToStringSerializer.class)
private Long villageId;
/**
* 街路巷
@@ -54,10 +57,30 @@
*/
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;
/**
* 更新时间
--
Gitblit v1.7.1