liujing
|
a4631f7880
|
Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_check
# Conflicts:
# app/build.gradle
# app/src/main/java/com/mogo/launcher/MogoApplication.java
# gradle.properties
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
# modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
# services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
# services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
# services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
|
2021-09-15 18:09:27 +08:00 |
|