修改小时和天的判断
Merge remote-tracking branch 'origin/master'