From 619ae08a6d56549687f0afd254cf66f8d9247b82 Mon Sep 17 00:00:00 2001
From: 15876 <AA269156750>
Date: Thu, 2 Mar 2023 14:50:39 +0800
Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  2 +-
 .../family/bean/FamilyInfoInUserInfo.java     | 36 -------------------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfoInUserInfo.java

diff --git a/build.gradle b/build.gradle
index 54933d139..a582ceb29 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         //realm 数据库插件
         classpath "io.realm:realm-gradle-plugin:5.3.0"
         // android 资源混淆插件
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfoInUserInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfoInUserInfo.java
deleted file mode 100644
index 1fcad2559..000000000
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfoInUserInfo.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.yizhuan.xchat_android_core.family.bean;
-
-import com.google.gson.Gson;
-
-import java.io.Serializable;
-
-import io.realm.RealmObject;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author jack
- * @Description
- * @Date 2018/5/24
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class FamilyInfoInUserInfo extends RealmObject implements Serializable {
-
-    private String familyId;
-    private String familyName;
-    private String familyIcon;
-
-    private String memberCount;//家族成员数
-
-    /**
-     * 转换成 FamilyInfo
-     * @return
-     */
-    public FamilyInfo toFamilyInfo(){
-        String json = new Gson().toJson(this);
-        return new Gson().fromJson(json,FamilyInfo.class);
-    }
-
-
-}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1d9e086cf..24aaf831c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
\ No newline at end of file