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

CeDo

2021-05-08 de1b433436014b539a7cf405a614d837f88f70c1

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

@@ -11,7 +11,7 @@
@ApiModel("修改用户电子档案")
@Data
public class UpdateUserArchivesVO {
    @ApiModelProperty(value = "用户id",hidden = false)
    @ApiModelProperty(value = "用户id",hidden = true)
    private Long userId;

    @ApiModelProperty("证件照（人像面）照片")