显示和隐藏基本和高级界面
Merge branch 'master' of https://github.com/zhulin3141/PPServ1.1

Conflicts:
	app.py