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

tangxiaobao

2021-08-02 cbb99a04ff6812b6dc9ec033c68407d3966417cc

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