post_list FactoryGirl 引发的问题修复
Merge branch 'blogs_functiontest_fix'
blogs functiontest fix
支持时间线的历史记录
Merge branch 'type_select_feature'