# Conflicts:
#	takeout/takeout.pro
1.合并登陆和订单新界面和打印本地化;