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

tangxiaobao

2021-07-27 9c8735c70d86a31081340ca78bb2b538ed11a6e5

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