部署完成
Merge branch 'feature/teaching' into develop
CC的绩效
部署服务器seed
修改日历插件和测试
Merge branch 'feature/zhaoxl' of github.com:TeamMemZhaoXiaoLong/xmcrm into feature/zhaoxl

Conflicts:
	app/controllers/ajax_request_controller.rb
	app/controllers/home_controller.rb
	app/views/teachers/arrage_time.html.erb
Merge branch 'feature/zhaoxl' into develop
Merge branch 'develop' into feature/performance
checkout devleop to checkout delete
把每天分为5个时段，每个时段一种颜色，修改删除，添加的bug