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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -16,6 +16,9 @@
    @ApiModelProperty("用户id")
    private Long userId;

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

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

@@ -23,7 +26,7 @@
    @ApiModelProperty("性别 1 男 2 女")
    private Integer sex;

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

    @ApiModelProperty("职业")