asdf
000000
.0.0.0.0.0
LAST

12-27
Merge branch 'master' of https://github.com/jijunyuan/OrderWaiterIpad-12-25

Conflicts:

OrderWaiterIpad.xcodeproj/project.xcworkspace/xcuserdata/tiankong360.xcu
serdatad/UserInterfaceState.xcuserstate
	OrderWaiterIpad/JJY_Code/View/Checked_dishesViewController.m