From b7694af918a917ad16a07f8cbf3ed48c462d8b0d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 26 八月 2021 18:56:03 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java
index 37ed640..6b69ccf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java
@@ -1,12 +1,11 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -23,7 +22,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.INPUT)
private Long id;
/**
@@ -42,18 +41,60 @@
private Integer relation;
/**
+ * 人和房屋关系’ (1.自住2、租住)
+ */
+ private Integer relationId;
+
+ /**
+ * 人和房屋关系’ (1.是、0.否)
+ */
+ private Integer residence;
+
+ /**
+ * 入住开始时间
+ */
+ private Date startAt;
+
+ /**
+ * 入住结束时间
+ */
+ private Date endAt;
+
+ /**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
private Date createAt;
+ /**
+ * 更改时间
+ */
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updateAt;
+
@Override
public String toString() {
- return "ComMngPopulationHouseUserDO{" +
- "id=" + id +
- ", populId=" + populId +
- ", houseId=" + houseId +
- ", createAt=" + createAt +
- "}";
+ return "ComMngPopulationHouseUserDO{" + "id=" + id + ", populId=" + populId + ", houseId=" + houseId
+ + ", createAt=" + createAt + ", updateAt=" + updateAt + "}";
+ }
+
+ /**
+ * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
+ */
+ public interface relation {
+ int hz = 1;
+ int po = 2;
+ int zn = 3;
+ int sn = 4;
+ int fm = 5;
+ int qt = 6;
+ }
+
+ /**
+ * 人和房屋关系’ (1.自住2、租住)
+ */
+ public interface relationId {
+ int zizhu = 1;
+ int zuzhu = 2;
}
}
\ No newline at end of file
--
Gitblit v1.7.1