From 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 17:30:57 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseDO.java | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 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..61f7254 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,11 +1,12 @@
package com.panzhihua.service_community.model.dos;
-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;
/**
* @auther lyq
@@ -22,7 +23,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -64,7 +65,7 @@
private String houseNo;
/**
- * 房屋状态(1.自住 2.租住 3.其他)
+ * 房屋状态(1.自住 2.租住 3.空置 4.其他)
*/
private Integer status;
@@ -91,7 +92,7 @@
/**
* 建筑面积
*/
- private Integer constructArea;
+ private BigDecimal constructArea;
/**
* 创建时间
@@ -105,22 +106,44 @@
@TableField(fill = FieldFill.UPDATE)
private Date updateAt;
+ /**
+ * 小区id
+ */
+ private Long villageId;
+
+ /**
+ * 街道id
+ *
+ * @return
+ */
+ private Long streetId;
+
+ /**
+ * 层次递归字段（省>市>区县>街道>社区>小区>详细地址）
+ */
+ private String path;
+
+ /**
+ * 楼层数
+ */
+ private Integer floorNum;
+
@Override
public String toString() {
- return "ComMngPopulationHouseDO{" +
- "id=" + id +
- ", address=" + address +
- ", code=" + code +
- ", alley=" + alley +
- ", houseNum=" + houseNum +
- ", status=" + status +
- ", purpose=" + purpose +
- ", controlStatus=" + controlStatus +
- ", isEmpty=" + isEmpty +
- ", constructPurpose=" + constructPurpose +
- ", constructArea=" + constructArea +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
+ return "ComMngPopulationHouseDO{" + "id=" + id + ", streetId=" + streetId + ", address=" + address + ", code="
+ + code + ", alley=" + alley + ", houseNum=" + houseNum + ", status=" + status + ", purpose=" + purpose
+ + ", controlStatus=" + controlStatus + ", isEmpty=" + isEmpty + ", constructPurpose=" + constructPurpose
+ + ", constructArea=" + constructArea + ", path=" + path + ", createAt=" + createAt + ", updateAt="
+ + updateAt + "}";
+ }
+
+ /**
+ * 房屋状态(1.自住 2.租住 3.空置 4.其他)
+ */
+ public interface status{
+ int zizhu = 1;
+ int zuzhu = 2;
+ int kongzhi = 3;
+ int qita = 4;
}
}
\ No newline at end of file
--
Gitblit v1.7.1