增加merchant

app/client/controllers/OrderController.php

@@ -131,7 +131,7 @@ class OrderController extends BaseController
 		$shop = ShopService::getDefaultShop($this->merchant);
 		$freight = MerchantExtendService::getFreight($this->merchantExtend);
 		$mapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
-		$out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey];
+		$out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey, 'merchant' => $this->merchant];
 		util::success($out);
 	}