fix bugs.3

BaseModule/src/main/java/com/xscm/moduleutil/base/WebUrlConstants.kt

@@ -23,7 +23,7 @@ object WebUrlConstants {
     val WEB_PROP_MALL_URL = BASE_URL + "/web/index.html#/pages/prop/propMall?id=%s"
 
     /**公会*/
-    val WEB_GUILD_URL = BASE_URL + "/web/index.html#/pages/union/index?id=%s"
+    val WEB_GUILD_URL = BASE_URL + "/web/index.html#/pages/union/index?id=%s&guild_id=%s"
 
     /**等级*/
     val WEB_GRADE_URL = BASE_URL + "/web/index.html#/pages/other/grade?id=%s"

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

@@ -50,7 +50,10 @@ public class UserInfo extends BaseEvent implements Serializable {
     private String chat_bubble;//聊天气泡
     private String charm;//魅力值
     private String room_id;
-    private String guild = "";//公会名称
+    private String guild_name = "";//公会名称
+    private int guild_id = 0;//公会id
+    private String me_guild_name = "";//公会名称
+    private int me_guild_id = 0;//公会id
     private String is_mute;//禁言状态 0否 1是
     private String is_mute_pit;//禁麦状态 0否 1是
     private String is_manager;//是否是管理员 0否 1是

BaseModule/src/main/java/com/xscm/moduleutil/utils/GsonUtils.java

@@ -26,7 +26,6 @@ public class GsonUtils {
             GSON = new GsonBuilder()
                     .serializeNulls() // 序列化 null 值
                     .registerTypeAdapterFactory(new BaseModelTypeAdapterFactory())
-                    .registerTypeAdapter(String.class,new NullToEmptyStringAdapter())
                     .create();
         }
         return GSON;