Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 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;
@@ -50,4 +50,6 @@

    @ApiModelProperty(value = "用户档案")
    private List<MemberArchiveVo> achiveList;


}