修改同一时间段互斥问题
Merge branch 'master' of github.com:benli0822/M2

Conflicts:
	web_avance/assets/js/custom/controller/buttonActionController.js