UPDATE
UPDATE:修改日期格式化
Merge branch 'qunar-0620' into qunar