作者 张关杰

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

@@ -40,7 +40,7 @@ class SuppliersController extends BaseController @@ -40,7 +40,7 @@ class SuppliersController extends BaseController
40 $resultData = json_decode($v['data']); 40 $resultData = json_decode($v['data']);
41 foreach ($resultData as $value){ 41 foreach ($resultData as $value){
42 $value = (array)$value; 42 $value = (array)$value;
43 - $value['keyword'] = $resultData['keyword']; 43 + $value['keyword'] = $v['keyword'];
44 $data[] = $value; 44 $data[] = $value;
45 } 45 }
46 } 46 }