* 改为弹出提示框
Merge branch 'master' of github.com:shell909090/lxcweb

Conflicts:
	main.py