设置修改
修改LivePPT接口文档Merge branch 'dev-iron' of https://github.com/FeverTeam/LivePPT-Play2 into dev-iron

Conflicts:
	LivePPT-2/conf/application.conf
Merge remote-tracking branch 'origin/dev-iron' into dev-iron
Merge branch 'dev-iron' of github.com:FeverTeam/LivePPT-Play2 into dev-iron

# By lizijing
# Via lizijing
* 'dev-iron' of github.com:FeverTeam/LivePPT-Play2:
  设置修改