fix: 合并冲突

2022-06-16 14:45:18 +08:00
parent 27a7474c92
commit 64a70c5ab3
5 changed files with 6 additions and 7 deletions
--- a/app/src/main/java/com/gh/common/util/DataUtils.java
+++ b/app/src/main/java/com/gh/common/util/DataUtils.java
@ -26,7 +26,6 @@ import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.entity.IdCardEntity;
 import com.gh.gamecenter.entity.UserInfoEntity;
 import com.gh.gamecenter.provider.GhContentProvider;
-import com.gh.gamecenter.retrofit.BiResponse;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.gid.GidCallback;
 import com.gh.gid.GidHelper;