# Conflicts: # app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java # config.gradle # m-audioim/src/main/java/com/ydl/audioim/YDLavManager.kt # m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt # m-consultant/src/main/java/com/yidianling/consultant/adapter/ExpertSearchAdapter.kt # m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml # m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLBaseMessageActivity.java # m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java # m-im/src/main/res_uikit/layout/im_nim_chat_confide_order_info_view.xml # m-im/src/main/res_uikit/layout/im_nim_ui_title_bar_bottom.xml # ydl-flutter-base/src/main/java/com/channel/ydl_flutter_base/plugin/YDLCommonPlugin.kt
