Merge branch 'zhongqi-birthDay' into dev

console/controllers/OrderController.php

@@ -118,7 +118,7 @@ class OrderController extends Controller
                 } catch (\Exception $e) {
                     $transaction->rollBack();
                     $msg = $e->getMessage();
-                    noticeUtil::push("处理报错了！订单号：{$orderSn}，错误信息：{$msg}", '15280215347');
+                    //noticeUtil::push("处理报错了！订单号：{$orderSn}，错误信息：{$msg}", '15280215347');
                 }
             }
         }