代码合并冲突解决

huanghongfa

2021-09-24 67b7fca6f21c2088a1887ba2027360efdb089c1c

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

@@ -85,4 +85,7 @@
    @ApiModelProperty(value = "用户昵称")
    private String nickName;

    @ApiModelProperty(value = "身份证")
    private String idCard;

}