解决冲突

app/JsonRpc/WebsiteServiceInterface.php

@@ -76,4 +76,11 @@ interface WebsiteServiceInterface
     public function getFooterContentList(array $data): array;
     public function getFooterContentInfo(array $data): array;
 
+
+    public function getWebsiteAdvertisement(array $data): array;
+    public function selectWebsiteDepartment(array $data): array;
+    public function selectWebsiteArea(array $data): array; //
+    public function getWebsiteModelCategory(array $data): array;
+    public function selectWebsiteLinks(array $data): array;
+
 }

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '741286a10b3b1d094e982cae1713014805109b53',
+        'reference' => '25952648a68d1ab21a1e4263ab32e54da797708a',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -439,7 +439,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '741286a10b3b1d094e982cae1713014805109b53',
+            'reference' => '25952648a68d1ab21a1e4263ab32e54da797708a',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),