同步外卖下单记录
Merge branch 'macro_dev' of https://github.com/iSCAU/iSCAU-Android into macro_dev

Conflicts:
	app/src/main/java/cn/scau/scautreasure/ui/OrderFood.java