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/ComMngPopulationHouseUserDO.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 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..00a0c8e 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
@@ -23,7 +23,7 @@
/**
* 主键id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.INPUT)
private Long id;
/**
@@ -42,10 +42,51 @@
private Integer relation;
/**
+ * 人和房屋关系’ (1.自住2、租住)
+ */
+ private Integer relationId;
+
+ /**
+ * 入住开始时间
+ */
+ private Date startAt;
+
+ /**
+ * 入住结束时间
+ */
+ private Date endAt;
+
+ /**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
private Date createAt;
+
+ /**
+ * 更改时间
+ */
+ @TableField(fill = FieldFill.UPDATE)
+ private Date 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;
+ }
@Override
public String toString() {
@@ -54,6 +95,7 @@
", populId=" + populId +
", houseId=" + houseId +
", createAt=" + createAt +
+ ", updateAt=" + updateAt +
"}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1