Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-08-30 22498e4ff995e9069ad0ed72b2a249172375a714

 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;