合并1

BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java

@@ -1,23 +1,19 @@
 package com.xscm.moduleutil.bean;
 
 import com.google.gson.annotations.SerializedName;
-import com.xscm.moduleutil.BaseEvent;
 import com.xscm.moduleutil.bean.room.FriendInfo;
 
 import java.io.Serializable;
 import java.util.List;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 /**
  *@author qx
  *@data 2025/6/3
  *@description: 个人信息，点击我的获取
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class UserInfo extends BaseEvent implements Serializable {
+public class UserInfo implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final String FEMALE = "2";
     public static final String MALE = "1";
@@ -72,9 +68,18 @@ public class UserInfo extends BaseEvent implements Serializable {
     private String red_num;
     private String ta;
 
+    private String nobility_image;//贵族图标
+    private String nickname_color;//昵称颜色
+    private String mic_cycle;//麦圈
+    private String is_hide;//0不能设置，1：可以设置
+    private String  hide_status;//0-取消隐身，1-设置隐身
+
+    private String enter_image;//爵位飘屏的背景
+    private String enter_text;//爵位飘屏的文字
 
 
-//    @Data
+
+    //    @Data
 //    public static class  TagList{
 //        private String id;
 //        private String tag_name;