Merge branch 'dev' of http://git.bocai108.com:10180/Ethan/Customer-Service into dev

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -206,7 +206,7 @@ class Events
     }
 
     //用户取消排队
-    public function cancelqueue($messageArray)
+    public static function cancelqueue($messageArray)
     {
         $uid = intval($messageArray['uid']);
         if (empty($uid)) {