From bb2da5de17a6d959f91738c17868b312ee14e86b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 20 五月 2021 19:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java | 102 +++++++++++++++++++++++++++++++-------------------
1 files changed, 63 insertions(+), 39 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java
index ac82c39..e5f7114 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComMngFamilyInfoDO.java
@@ -1,11 +1,10 @@
package com.panzhihua.service_user.model.dos;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -14,7 +13,7 @@
* @create: 2020-12-14 16:51
**/
@Data
-@TableName("sys_user")
+@TableName("com_mng_family_info")
public class ComMngFamilyInfoDO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -25,42 +24,67 @@
private Long id;
/**
- * 丈夫 人员信息id
- */
- private Long husbandId;
-
- /**
- * 妻子 人员信息id
- */
- private Long wifeId;
-
- /**
- * 父亲 人员信息id
- */
- private Long fatherId;
-
- /**
- * 母亲 人员信息id
- */
- private Long motherId;
-
- /**
- * 子女 人员信息id列表信息，以逗号分隔
- */
- private String childrenIds;
-
- /**
- * 岳父 人员 id
- */
- private Long fatherInLawId;
-
- /**
- * 岳母 人员 id
- */
- private Long motherInLawId;
-
- /**
* 本人id
*/
private Long userId;
+
+ /**
+ * 与本人关系
+ */
+ private String relationship;
+
+ /**
+ * 名字
+ */
+ private String name;
+
+ /**
+ * 身份证号
+ */
+ private String idCard;
+
+ /**
+ * 手机号
+ */
+ private String phone;
+
+ /**
+ * 年龄
+ */
+ private Integer age;
+
+ /**
+ * 健康状况
+ */
+ private String health;
+
+ /**
+ * 工作
+ */
+ private String job;
+
+ /**
+ * 证件照（人像面）照片
+ */
+ private String cardPhotoFront;
+ /**
+ * 证件照（国徽面）照片
+ */
+ private String cardPhotoBack;
+ /**
+ * 户口本照片 逗号隔开
+ */
+ private String familyBook;
+
+ /**
+ * create_at
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createAt;
+
+ /**
+ * update_at
+ */
+ @TableField(fill = FieldFill.UPDATE)
+ private Date updateAt;
}
--
Gitblit v1.7.1