Commit 15b7a540 authored by fengruiyu's avatar fengruiyu

解决冲突

parent bb841b64
......@@ -2,9 +2,9 @@ package com.mints.street.login
import android.app.Application
import androidx.lifecycle.MutableLiveData
import com.fry.base.basenetwork.HttpSubscribeImpl
import com.mints.street.bean.AwardBean
import com.mints.street.model.ApiModel
import com.mints.street.netwrok.base.HttpSubscribeImpl
import me.goldze.mvvmhabit.base.BaseViewModel
import me.goldze.mvvmhabit.http.BaseResponse
import me.goldze.mvvmhabit.utils.KLog
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment