资源配置 机房子段必填
Merge branch 'master' of https://github.com/caoguangyao/wasu_rmss

Conflicts:
	.gitignore