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

gx报错



查看合并请求 !2138

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