Merge branch 'zhongqi-delivery' into dev

common/components/delivery/platform/fengniao/CallBackNotify.php

@@ -51,7 +51,7 @@ class CallBackNotify
         $deliveryOrder->orderStatus = $sendStatus;
         $deliveryOrder->save();
 
-        $order = OrderClass::getById($deliveryOrder->ghsOrderId, true, 'sendType,sendStatus,deliveryId');
+        $order = OrderClass::getById($deliveryOrder->ghsOrderId, true, 'id,sendType,sendStatus,deliveryId');
         $order->sendStatus = $sendStatus;
         $order->save();