# 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

Feat/qj/confide optimize

See merge request app_android_lib/YDL-Component!239

feat: 修改筛选框价格文案，价格筛选传值字段使用后端返回的字段

See merge request app_android_lib/YDL-Component!237

Feat/qj/confide optimize

See merge request app_android_lib/YDL-Component!238

D/v confide optimized

See merge request app_android_lib/YDL-Component!203

Feat/lp/lp merge release

See merge request app_android_lib/YDL-Component!236

# Conflicts:
#	config.gradle

D/v4.4.01

See merge request app_android_lib/YDL-Component!235

      情绪训练营专题页
      排序中台优化

feat: 前置信息收集卡，通过服务端控制是否展示

See merge request app_android_lib/YDL-Component!234

Feat/yk/yk mood

See merge request app_android_lib/YDL-Component!233

feat: 合规化androidId问题修复

See merge request app_android_lib/YDL-Component!230

Feat/yk sort 2

See merge request app_android_lib/YDL-Component!232

# Conflicts:
#	config.gradle

Feat/hot fix

See merge request app_android_lib/YDL-Component!231

# Conflicts:
#   config.gradle

接通率优化

See merge request app_android_lib/YDL-Component!229

Feat/qj/confide optimize

See merge request app_android_lib/YDL-Component!228

JsMethod.kt

See merge request app_android_lib/YDL-Component!227