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

xyh

2021-06-18 aa9d5899deda2c9a9c4da111e89509136f1c4ec2

 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;