Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 49f8452f2df3a630cf62e0c03909fe6862c4fc98

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

@@ -2,6 +2,7 @@

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,6 +27,7 @@
    private Integer sex;

    @ApiModelProperty("出生年月")
    @JsonFormat(timezone = "GMT+8")
    private Date birthday;

    @ApiModelProperty("职业")