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

@@ -55,7 +55,7 @@ class ProductController extends BaseController
             $map[] =  ['status', $this->param['status']];
         }
         $sort = ['id' => 'desc'];
-        $data = $logic->getList($map, $sort, ['id', 'project_id', 'title', 'category_id', 'keyword_id', 'status', 'created_uid', 'created_at', 'updated_at']);
+        $data = $logic->getList($map, $sort, ['id', 'project_id', 'title', 'thumb', 'category_id', 'keyword_id', 'status', 'created_uid', 'created_at', 'updated_at']);
         return $this->success($data);
     }
 

@@ -29,6 +29,8 @@ class ProductLogic extends  BaseLogic
     public function getList(array $map = [], array $sort = ['id' => 'desc'], array $columns = ['*'], int $limit = 20)
     {
         $data = parent::getList($map, $sort, $columns, $limit);
+        var_dump($data);
+        die();
         foreach ($data['list'] as &$v){
             $v = $this->formatData($v);
             $v['thumb']['image_link'] = $v['thumb']['url'];//图片统一