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

gx



查看合并请求 !775

@@ -79,8 +79,8 @@ class OperationHeartbeatController extends BaseController
         if($info === false){
         if($info === false){
             $info = [];
             $info = [];
         }else{
         }else{
-            $date_time = strtotime($info['updated_at']) + (90 * 60);
-            if($date_time > time()){
+            $date_time = strtotime($info['updated_at']) + 7200;
+            if($date_time < time()){
                 $operationHeartbeatModel->edit(['status'=>0],$condition);
                 $operationHeartbeatModel->edit(['status'=>0],$condition);
                 $info['status'] = 0;
                 $info['status'] = 0;
             }
             }