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

@@ -429,7 +429,7 @@ class ImageController extends Controller
     public function responseData($path = '', $name = ''){
         $data = [
             'image'=>$path,
-            'image_link'=>getImageUrl($path,$this->cache['storage_type'] ?? 0,$this->cache['project_location']),
+            'image_link'=>getImageUrl($path,$this->cache['storage_type'] ?? 0,$this->cache['project_location'] ?? 0),
             'name'=>$name,
             'image_download'=>url('a/download_images?path='.$path)
         ];