合并分支 'lyh-server' 到 'master'

GXgeo设置



查看合并请求 !2326

@@ -95,7 +95,7 @@ class OperationHeartbeatController extends BaseController
         }else{
             $date_time = strtotime($info['updated_at']) + 60;
             if($date_time < time()){
-                $operationHeartbeatModel->edit(['status'=>0,'ip'=>'127.0.0.1'],$condition);
+                $operationHeartbeatModel->edit(['status'=>0,'ip'=>'127.0.0.1'],['id'=>$info['id']]);
                 $info['status'] = 0;
             }
             if($info['status'] == 1){