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

@@ -30,6 +30,7 @@ class ProjectKeywordController extends BaseController
         }
         }
         $data['search_keywords'] = $info['search_keywords'];
         $data['search_keywords'] = $info['search_keywords'];
         $data['customer_keywords'] = $info['customer_keywords'];
         $data['customer_keywords'] = $info['customer_keywords'];
+        $data['brand_keyword'] = $info['brand_keyword'];
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }