From 1a054c486c9037b7cb0bca5c4472c628d1d1c36c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 28 六月 2021 16:54:06 +0800
Subject: [PATCH] 解决代码被合并后删除问题
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
index ca6100a..6b0e087 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java
@@ -1,8 +1,14 @@
package com.panzhihua.common.model.vos.user;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -17,27 +23,49 @@
@ApiModelProperty("自增id")
private Long id;
- @ApiModelProperty("丈夫 人员信息id")
- private Long husbandId;
-
- @ApiModelProperty("妻子 人员信息id")
- private Long wifeId;
-
- @ApiModelProperty("父亲 人员信息id")
- private Long fatherId;
-
- @ApiModelProperty("母亲 人员信息id")
- private Long motherId;
-
- @ApiModelProperty("子女 人员信息id列表信息，以逗号分隔")
- private String childrenIds;
-
- @ApiModelProperty("岳父 人员 id")
- private Long fatherInLawId;
-
- @ApiModelProperty("岳母 人员 id")
- private Long motherInLawId;
-
@ApiModelProperty("本人id")
private Long userId;
+
+ @ApiModelProperty("与本人关系")
+ @NotBlank(groups = {AddGroup.class},message ="与本人关系不能为空" )
+ private String relationship;
+
+ @ApiModelProperty("名字")
+ @NotBlank(groups = {AddGroup.class},message ="名字不能为空" )
+ private String name;
+
+ @ApiModelProperty("身份证号")
+ @NotBlank(groups = {AddGroup.class},message ="身份证号不能为空" )
+ private String idCard;
+
+ @ApiModelProperty("手机号")
+ @NotBlank(groups = {AddGroup.class},message ="手机号不能为空" )
+ private String phone;
+
+ @ApiModelProperty(value = "年龄",hidden = true)
+ private Integer age;
+
+ @ApiModelProperty("健康状况")
+ private String health;
+
+ @ApiModelProperty("工作")
+ private String job;
+
+ @ApiModelProperty("证件照（人像面）照片")
+ private String cardPhotoFront;
+
+ @ApiModelProperty("证件照（国徽面）照片")
+ private String cardPhotoBack;
+
+ @ApiModelProperty("户口本照片 逗号隔开")
+ private String familyBook;
+
+ @ApiModelProperty(value = "create_at",hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createAt;
+
+ @ApiModelProperty(value = "update_at",hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateAt;
+
}
--
Gitblit v1.7.1