Merge branch 'master' into txb

tangxiaobao

2021-08-16 a7dc5d2d03deacb8c7c0028a46aba2f141f35649

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

@@ -26,6 +26,9 @@
    @ApiModelProperty("昵称")
    private String nickName;

    @ApiModelProperty("身份证号码")
    private String idCard;

    @ApiModelProperty("真实名字")
    private String name;