# Conflicts:
#	api/consultant/src/main/java/com/yidianling/consultant/OnBottomWordListener.kt
#	api/consultant/src/main/java/com/yidianling/consultant/bean/FunctionWordConsultBean.kt
#	config.gradle
#	m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
#	m-consultant/src/main/java/com/yidianling/consultant/HotSearchActivity.kt
#	m-home/src/ydl/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt