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

CeDo

2021-05-12 115ba80cfd41258574d0e215e427cb041e21b40f

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

@@ -22,4 +22,7 @@

    @ApiModelProperty("户口本照片 逗号隔开")
    private String familyBook;

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