From 02b5015e989fef8878744d50f21a092efa395231 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 16 六月 2021 19:22:26 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationHouseUserDO.java |   17 ++++++++++++++++-
 1 files changed, 16 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..a80a039 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,6 +42,21 @@
     private Integer relation;
 
     /**
+     * 人和房屋关系’ (1.自住2、租住)
+     */
+    private Integer relationId;
+
+    /**
+     * 入住开始时间
+     */
+    private Date startAt;
+
+    /**
+     * 入住结束时间
+     */
+    private Date endAt;
+
+    /**
      * 创建时间
      */
     @TableField(fill = FieldFill.INSERT)

--
Gitblit v1.7.1