时间类型写死了，是病要改
Merge branch 'master' of https://github.com/airballoon/stars into ericlinj
Merge branch 'master' of https://github.com/airballoon/stars into ericlinj