yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突-EntranceFragment再验证一遍

Browse Source
This commit is contained in:
liujing
2021-09-15 19:57:10 +08:00
parent f270ea54c6
commit 99cd66191c
6 changed files with 28 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
View File

@@ -11,14 +11,9 @@ import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.analytics.IMogoAnalytics;
import com.mogo.service.auth.IMogoAuthManager;
import com.mogo.service.cardmanager.IMogoCardManager;
<<<<<<< HEAD
import com.mogo.service.check.ICheckProvider;
import com.mogo.service.connection.IMogoSocketManager;
import com.mogo.service.connection.IMogoWebSocketManager;
=======
import com.mogo.service.cloud.socket.IMogoSocketManager;
import com.mogo.service.cloud.socket.IMogoWebSocketManager;
>>>>>>> dev/dev_eagle_architecture_upgrade
import com.mogo.service.datamanager.IMogoDataManager;
import com.mogo.service.entrance.IMogoEntranceButtonController;
import com.mogo.service.eventpanel.IEventPanelProvider;