合并代码

puzhibing

2024-03-18 65ca63cc3d36f23d285a7d944fcc0d6bac92430d

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberBasicFileVo.java

@@ -21,7 +21,7 @@
    private Long userId;

    @ApiModelProperty(value = "用户名称")
    private String nickName;
    private String realName;

    @ApiModelProperty(value = "手机号码")
    private String phonenumber;