add new file
更新mongo数据库配置
Merge branch 'master' of https://github.com/zhangkai1108/boottest

Conflicts:
	.idea/workspace.xml