Merge branch 'master' of http://git.huxiukeji.com/lizhen/xiaoshan

addons/shopro/controller/order/Express.php

@@ -16,7 +16,9 @@ class Express extends Common
     public function index()
     {
         $user = auth_user();
-        $order_id = $this->request->param('order_id');
+        $order_sn = $this->request->param('order_sn');
+
+        $order_id = Db::name('shopro_order')->where('order_sn',$order_sn)->value('id');
 
         // 更新包裹信息（5分钟缓存）
         (new ExpressLib)->updateOrderExpress($order_id);