Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -344,9 +344,9 @@ class ImageController extends Controller
         }else{
             $projectModel = new Project();
             $project_info = $projectModel->read(['id'=>$this->cache['project_id']],['upload_location']);
-            if($project_info['upload_location'] != 1){
-                $this->upload_location = 0;
-            }
+            var_dump($project_info);
+            die();
+            $this->upload_location = $project_info['upload_location'];
             $this->path = $this->uploads['path_b'].'/'.$this->cache['project_id'].'/'.$this->image_type[$this->param['refer']].'/'.date('Y-m');
         }
     }