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

huanghongfa

2021-07-21 4e8338d3e2b30e360f028c9f2354462ca817a989

 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;