# Conflicts:
#	takeout/control/stallsgetwork.cpp
#	takeout/view/newmainform.cpp
#	takeout/view/newmainform.ui
1.界面调整基本完成;