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

@@ -262,7 +262,7 @@ class ImageController
                         $data['image_link'] = url('/b/image/' . $v);
                         $data['image_link'] = url('/b/image/' . $v);
                         break;
                         break;
                     case 'path':
                     case 'path':
-                        $data['path_link'] = url('/public/upload/images/' . basename($v));
+                        $data['path_link'] = url('/upload/images/' . basename($v));
                         break;
                         break;
                 }
                 }
             }
             }