Merge remote-tracking branch 'origin/master'

application/expand/controller/Xcx.php

@@ -186,7 +186,7 @@ class Xcx extends BaseAuth
         if ($errCode == 0) {
             $data =  json_decode($data,true);
             HelperService::returnJson([
-                'data'=>  array_merge($openInfo,['appId'=>$appId]),'msg'=>'success','code'=>200
+                'data'=>  array_merge($data,['appId'=>$appId]),'msg'=>'success','code'=>200
             ]);
         }