checkout devleop to checkout delete
把每天分为5个时段，每个时段一种颜色，修改删除，添加的bug
Merge branch 'feature/zhaoxl' into develop