UPDATE：更新解析方式
Merge branch 'qunar-0715-2' into qunar
UPDATE:更新返回错误标识
Merge branch 'qunar-0715-3' into qunar