添加时间
修改时间bug
Merge pull request #1 from catee/master

Test