Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang

zhanglin8526

2023-05-10 39748c770c83ff1b1e4593c5f24b147361e587c0

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

@@ -28,6 +28,9 @@
    @ApiModelProperty("用户头像")
    private String avatar;

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

    @ApiModelProperty(value = "用户标签")
    private String userTags;