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

@@ -60,9 +60,8 @@ class ProductLogic extends  BaseLogic
             $info['gallery'] = json_decode($info['gallery']);
             $info['gallery'] = json_decode($info['gallery']);
             foreach ($info['gallery'] as $k => $v){
             foreach ($info['gallery'] as $k => $v){
                 $v = (array)$v;
                 $v = (array)$v;
-                var_dump($v);
-                die();
-                $info['gallery'][$k]['image_link'] = $v['url'];
+                $v['image_link'] = $v['url'];
+                $info['gallery'][$k] = $v;
             }
             }
         }
         }
         return $info;
         return $info;