修改时间设置逻辑
Merge branch 'master' into appfog