Merge branch 'sh-send' into dev

app-ghs/controllers/TestController.php

@@ -96,6 +96,10 @@ class TestController extends BaseController
         $ret = shippingUtil::isTradeManageConfirmComplete($merchant, $data, $ptStyle);
         echo '<pre>';
         print_r($ret);
+
+        $r = expressUtil::getAllDelivery($merchant, $ptStyle);
+        print_r($r);
+
     }
 
     public function actionIn()