冲突测试

两个程序员同时修改一个文件
Merge branch 'master' of https://github.com/isiwnlg/bingo.git

Conflicts:
	bingo/src/main/java/bingo/cat/vo/Role.java