role update
Merge branch 'master' of https://github.com/antme/pms

Conflicts:
	service/src/main/java/com/pms/service/annotation/InitBean.java