# Conflicts: # doraemon/views/partial/analysis.hbs
2.3.5 -> 2.3.7 yas 2.3.5 -> 2.3.7 See merge request !434
add build See merge request !429
微信退出后不自动登录 See merge request !428
Feature/weixinlogin See merge request !427
Gray See merge request !425
修改分期付款帮助跟协议 See merge request !420
锁定node-lib版本 See merge request !419
yasbug See merge request !417
Feature/geetest See merge request !415
Hotfix/consults See merge request !403