# 测试提交
Merge branch 'master' of https://github.com/WeiMT/CMT

Conflicts:
	Manager.Web/ApiControllers/ApiSettingController.cs