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

Lyh server



查看合并请求 !3105

@@ -112,12 +112,13 @@ class GeoController extends BaseController
         }
         }
         $content = explode("\n", $data->content);
         $content = explode("\n", $data->content);
         $confirm = explode("\n", $data->confirm);
         $confirm = explode("\n", $data->confirm);
+        $max_num = $data->max_num;
         $type = $data->type;
         $type = $data->type;
         $status = $data->status;
         $status = $data->status;
         $projectModel = new Project();
         $projectModel = new Project();
         $projectInfo = $projectModel->read(['id' => $data->project_id],['title','version']);
         $projectInfo = $projectModel->read(['id' => $data->project_id],['title','version']);
         $project_title = $projectInfo['title'] ?? '';
         $project_title = $projectInfo['title'] ?? '';
-        $result = compact('content', 'confirm', 'type', 'status', 'project_title');
+        $result = compact('content', 'confirm', 'type', 'status', 'project_title','max_num');
         $this->response('success',Code::SUCCESS,$result);
         $this->response('success',Code::SUCCESS,$result);
     }
     }
 
 

@@ -71,9 +71,6 @@ class GeoConfirmLogic extends BaseLogic
         if($data === false){
         if($data === false){
             return $this->success();
             return $this->success();
         }
         }
-        if(empty($data['confirm'])){
-            $data['confirm']  = $data['content'];
-        }
         return $this->success($data);
         return $this->success($data);
     }
     }