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

@@ -31,6 +31,7 @@ class ProductLogic extends  BaseLogic
         $data = parent::getList($map, $sort, $columns, $limit);
         $data = parent::getList($map, $sort, $columns, $limit);
         foreach ($data['list'] as &$v){
         foreach ($data['list'] as &$v){
             $v = $this->formatData($v);
             $v = $this->formatData($v);
+            $v['thumb']['image_link'] = $v['thumb']['url'];//图片统一
         }
         }
         return $this->success($data);
         return $this->success($data);
     }
     }