Merge branch 'shish-cb' into dev

biz-ghs/express/classes/ExpressClass.php

@@ -28,12 +28,11 @@ class ExpressClass extends BaseClass
         $merchant = WxOpenClass::getGhsWxInfo();
         $ptStyle = dict::getDict('ptStyle', 'ghs');
 
-        $orderSn = $params['orderSn'];
         $openId = $params['openId'];
         $deliveryId = $params['deliveryId'];
-        $bizId = $params['bizId'];
 
         $wayBillId = $order->fhWlNo ?? '';
+        $orderSn = $order->orderSn;
 
         $data = [
             'openid' => $openId,