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/ComMngPopulationHouseDO.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java
index 457657a..e66a612 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java
@@ -1,9 +1,12 @@
package com.panzhihua.service_community.model.dos;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
@@ -22,7 +25,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.INPUT)
private Long id;
/**
@@ -91,7 +94,7 @@
/**
* 建筑面积
*/
- private Integer constructArea;
+ private BigDecimal constructArea;
/**
* 创建时间
@@ -105,10 +108,27 @@
@TableField(fill = FieldFill.UPDATE)
private Date updateAt;
+ /**
+ * 小区id
+ */
+ private Long villageId;
+
+ /**
+ * 街道id
+ * @return
+ */
+ private Long streetId;
+
+ /**
+ * 层次递归字段（省>市>区县>街道>社区>小区>详细地址）
+ */
+ private String path;
+
@Override
public String toString() {
return "ComMngPopulationHouseDO{" +
"id=" + id +
+ ", streetId="+streetId+
", address=" + address +
", code=" + code +
", alley=" + alley +
@@ -119,6 +139,7 @@
", isEmpty=" + isEmpty +
", constructPurpose=" + constructPurpose +
", constructArea=" + constructArea +
+ ", path="+path+
", createAt=" + createAt +
", updateAt=" + updateAt +
"}";
--
Gitblit v1.7.1