Merge branch 'test'

application/api_broker/service/BrokerService.php

@@ -58,7 +58,8 @@ class BrokerService
                 $this->aBD->updateDevice([ "id" => $item["id"], "push_id" => $push_id, "device_id" => $device_id ]);
                 return true;
             }
-            if($device_id == $item["device_id"] ){
+            if (($is_pc == 0 && $device_id == $item["device_id"])
+                || ($is_pc == 1 && $push_id = $item["push_id"] && $device_id == $item["device_id"])) {
                 if ($item["is_forbidden"] == 0) {
                     return true;
                 } elseif ($item["is_forbidden"] == 1) { //已存在申请关系