1

app/JsonRpc/WebsiteService.php

@@ -555,7 +555,7 @@ class WebsiteService implements WebsiteServiceInterface
             
         }
         $result=$depart;
-        return Result::success($result['data']); 
+        return Result::success($result); 
     }
 
 

vendor/composer/installed.php

@@ -3,7 +3,15 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
+<<<<<<< HEAD
         'reference' => 'ac7fc06e0b44894808a1907435e9a1d19a0880b8',
+=======
+<<<<<<< Updated upstream
+        'reference' => '302c71b5779d4f993766fe28f5744c7031aef775',
+=======
+        'reference' => '08a0dff23ccd1c9e2b772cc20b659956f2a2fd3a',
+>>>>>>> Stashed changes
+>>>>>>> web_sannong_fr
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -457,7 +465,15 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
+<<<<<<< HEAD
             'reference' => 'ac7fc06e0b44894808a1907435e9a1d19a0880b8',
+=======
+<<<<<<< Updated upstream
+            'reference' => '302c71b5779d4f993766fe28f5744c7031aef775',
+=======
+            'reference' => '08a0dff23ccd1c9e2b772cc20b659956f2a2fd3a',
+>>>>>>> Stashed changes
+>>>>>>> web_sannong_fr
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),