# Conflicts:
#	app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java
#	config.gradle
#	m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt
#	m-home/src/main/java/com/yidianling/home/event/HomeBaseImpl.kt