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

@@ -297,6 +297,7 @@ class ProductController extends BaseController
         }elseif($v['type'] == 4){
             $arr1 = json_decode($info['values']);
             foreach ($arr1 as $k1=>$v1){
+                $v1 = (array)$v1;
                 if(isset($v1['url'])){
                     $v1['url'] = getFileUrl($v1['url']);
                 }else{