Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-07 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserArchivesVO.java

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.user;

import java.util.Date;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * @auther llming
@@ -16,19 +16,20 @@
    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("真实名字")
    private String name;

    @ApiModelProperty("身份证号")
    private String idCard;


    @ApiModelProperty("性别 1 男 2 女")
    private Integer sex;

    @ApiModelProperty("生日")
    @ApiModelProperty("出生年月")
    private Date birthday;

    @ApiModelProperty("职业")
    private String job;


    @ApiModelProperty("证件照（人像面）照片")
    private String cardPhotoFront;