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

@@ -58,8 +58,7 @@ class ProductLogic extends  BaseLogic
         //统一图片链接
         //统一图片链接
         if(!empty($info['gallery'])){
         if(!empty($info['gallery'])){
             foreach ($info['gallery'] as $k => $v){
             foreach ($info['gallery'] as $k => $v){
-                $v = (array)$v;
-                $v['image_link'] = $this->getImageUrl($v['url']);
+                $v['image_link'] = $v['url'];
                 $info['gallery'][$k] = $v;
                 $info['gallery'][$k] = $v;
             }
             }
         }
         }