登录方法 和secretary DB
Merge branch 'master' of https://github.com/benli0822/M2

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