From 10df7e29b51d6a2efacc83d870856f57d97a9b66 Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期一, 24 十月 2022 13:48:24 +0800 Subject: [PATCH] #feat 修改别名 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ComMngFamilyInfoVO.java | 75 +++++++++++++++++++++++++++---------- 1 files changed, 54 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..95e8791 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,5 +1,14 @@ package com.panzhihua.common.model.vos.user; +import java.util.Date; + +import javax.validation.constraints.NotBlank; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.panzhihua.common.validated.AddGroup; + import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,29 +24,53 @@ public class ComMngFamilyInfoVO { @ApiModelProperty("自增id") + @JsonSerialize(using = ToStringSerializer.class) 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") + @JsonSerialize(using = ToStringSerializer.class) 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