修改了数据库
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform.git

Conflicts:
	client/src/common/FriendList.js