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/ComMngPopulationDO.java |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
index d5a6954..98472fe 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java
@@ -42,8 +42,7 @@
     /**
      * 年龄
      */
-    @TableField(exist = false)
-    private Integer age;
+//    private Integer age;
     /**
      * 身份证号码
      */
@@ -138,8 +137,7 @@
     /**
      * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他)
      */
-    @TableField(exist = false)
-    private Integer relation;
+//    private Integer relation;
 //
 //    private String relationStr;
 
@@ -162,8 +160,7 @@
     /**
      * 房屋地址
      */
-    @TableField(exist = false)
-    private String houseAddress;
+//    private String houseAddress;
 
     /**
      * 出生年月日
@@ -173,8 +170,7 @@
     /**
      * 居住地房屋id
      */
-    @TableField(exist = false)
-    private Long houseId;
+//    private Long houseId;
 
     /**
      * 性别(1.男 2.女 3.未知)
@@ -212,4 +208,4 @@
         int wd = 2;
     }
 
-}
\ No newline at end of file
+}

--
Gitblit v1.7.1