Merge branch 'ft-immediateDelivery' into test

src/Goods/Enum/GoodsEnum.php

@@ -16,6 +16,7 @@ class GoodsEnum
 
 
 	const SERVER_GOODS = 1;//服务商品
 	const SERVER_GOODS = 1;//服务商品
 	const ENTITY_GOODS = 2;//实体商品
 	const ENTITY_GOODS = 2;//实体商品
+	const TAKE_OUT_GOODS = 3;//外卖商品
 
 
 
 
 	const FREIGHT_FREE = 1; //包邮
 	const FREIGHT_FREE = 1; //包邮