tongchenfei 32528ff385 Merge branch 'dev_merge_extension_entrance' into dev ...

合并了右侧顶部的几个view，合并到了EntranceFragment中，ExtensionFragment暂时不使用了

# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

2020-07-01 15:13:16 +08:00

..

main

Merge branch 'dev_merge_extension_entrance' into dev

2020-07-01 15:13:16 +08:00