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

@@ -39,7 +39,8 @@ class SuppliersController extends BaseController
             foreach ($lists as $v){
                 $resultData = json_decode($v['data']);
                 foreach ($resultData as $value){
-                    $value['keyword'] = $v['keyword'];
+                    $value = (array)$value;
+                    $value['keyword'] = $resultData['keyword'];
                     $data[] = $value;
                 }
             }