Merge branch 'test' into test_future_wangge

CeDo

2021-05-24 2e2126c6d4a788d994a006152f165b7ac7165882

 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;
}