Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

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

@@ -26,10 +26,10 @@
    @ApiModelProperty(value = "手机号码")
    private String phonenumber;

    @ApiModelProperty("用户头像")
    @ApiModelProperty(value="用户头像")
    private String avatar;

    @ApiModelProperty("用户生日")
    @ApiModelProperty(value="用户生日")
    private String birthday;

    @ApiModelProperty(value = "用户类型")