全新的总经理界面
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/loginInfoTemp.ser