Merge pull request #130 from hopesfish/dev

update
修改end 的时间查询问题
Merge pull request #122 from pengqin/dev

Dev