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

变更数据



查看合并请求 !3006

@@ -35,7 +35,7 @@ class GeoController extends BaseController
             'project_id.required' => '项目ID不能为空',
         ]);
         $projectModel = new Project();
-        $project_geo_conf = $projectModel->read(['project_id' => $this->param['project_id']],['title', 'version', 'geo_status', 'geo_qualify_num']);
+        $project_geo_conf = $projectModel->read(['id' => $this->param['project_id']],['title', 'version', 'geo_status', 'geo_qualify_num']);
         $geoConfModel = new GeoConf();
         $geo_conf = $geoConfModel->read(['project_id' => $this->param['project_id']]);
         $geo_manage_list = $geoConfModel->geoManage();