Merge branch 'test_bak' into 'master'

罗元桥

2021-10-01 8e0ea6ae57f6b7561221cba32c8b9c977385adf1

Merge branch 'test_bak' into 'master'

Test bak

See merge request root/zhihuishequ!223

 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("职业")