wangcongtao
0a41173d07
Merge remote-tracking branch 'origin/demo/shunyi_v2v_merge' into demo/shunyi_v2v_merge
# Conflicts:
# modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/launcher/MogoMainAuthorize.kt
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.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