修改排课日历插件
Merge branch 'feature/zhaoxl' of github.com:TeamMemZhaoXiaoLong/xmcrm into feature/zhaoxl

Conflicts:
	app/views/teachers/arrage_time.html.erb
解决冲突
解决冲突后遗症