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

tangxiaobao

2021-07-22 1627ec87769c53f3f7bc69eaf75cc5b0a38ff112

 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;