From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期一, 07 六月 2021 09:28:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java | 64 ++++++++++++++++++++++++++++--- 1 files changed, 57 insertions(+), 7 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 905dc45..916ea7a 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 @@ -1,9 +1,6 @@ package com.panzhihua.service_community.model.dos; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass; import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField; import lombok.Data; @@ -58,7 +55,7 @@ /** * 门牌号 */ - private Integer doorNo; + private String doorNo; /** * 楼排号 */ @@ -66,11 +63,11 @@ /** * 单元号 */ - private Integer unitNo; + private String unitNo; /** * 户室(房间号) */ - private Integer houseNo; + private String houseNo; /** * 政治面貌(1.中共党员2.中共预备党员3.共青团员4.民革党员5.民盟盟员6.民建会员7.8.农工党党员9.致公党党员10.九三学社社员11.台盟盟员12.无党派人士13.群众) */ @@ -89,6 +86,14 @@ @EncryptDecryptField private String phone; /** + * 外地or本地(1.本地 2.外地) + */ + private Integer outOrLocal; + /** + * 户口所在地 + */ + private String censusRegister; + /** * 备注 */ private String remark; @@ -99,10 +104,12 @@ /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private Date createAt; /** * 修改时间 */ + @TableField(fill = FieldFill.UPDATE) private Date updateAt; /** * 籍贯 @@ -121,6 +128,41 @@ */ @TableField(exist = false) private String villageName; + + /** + * 与户主关系(1.户主 2.配偶 3.子女 4.孙女 5.父母 6.其他) + */ + private Integer relation; + + /** + * 文化程度(1.小学 2.初中 3.高中 4.中专 5.大专 6.本科 7.硕士 8.博士 9.其他) + */ + private Integer cultureLevel; + + /** + * 婚姻状况(1.未婚 2.已婚 3.离异 4.丧偶 5.分居 6.其他) + */ + private Integer marriage; + + /** + * 健康状况 + */ + private String healthy; + + /** + * 房屋地址 + */ + private String houseAddress; + + /** + * 出生年月日 + */ + private String birthday; + + /** + * 居住地房屋id + */ + private Long houseId; /** * 性别(1.男 2.女 3.未知) @@ -150,4 +192,12 @@ int no = 13; } + /** + * 外地or本地(1.本地 2.外地) + */ + public interface outOrLocal{ + int bd = 1; + int wd = 2; + } + } -- Gitblit v1.7.1