merge就本地调试好了再合，处理不了还要别人来弄

app/JsonRpc/WebsiteServiceInterface.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\JsonRpc;
+
 interface WebsiteServiceInterface
 {
     /**
@@ -18,7 +19,7 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return array
      */
-    public function updateWebsite(int $id,array $data): array;
+    public function updateWebsite(int $id, array $data): array;
 
     /**
      * @param int $id
@@ -35,14 +36,14 @@ interface WebsiteServiceInterface
     public function getWebsiteColumn(array $data): array;
     public function getWebsiteColumnList(array $data): array;
     public function createWebsiteColumn(array $data): array;
-    public function updateWebsiteColumn(int $id,array $data): array;
-    public function getWebsiteRoleList(string $keyword,int $page,int $pageSize,int $websiteId): array;
+    public function updateWebsiteColumn(int $id, array $data): array;
+    public function getWebsiteRoleList(string $keyword, int $page, int $pageSize, int $websiteId): array;
     public function createWebsiteRole(array $data): array;
-    public function updateWebsiteRole(int $id,array $data): array;
+    public function updateWebsiteRole(int $id, array $data): array;
     public function delWebsiteRole(int $id): array;
-    public function getWebsiteRoleUserList(string $keyword,int $page,int $pageSize,int $websiteId,int $roleId): array;
+    public function getWebsiteRoleUserList(string $keyword, int $page, int $pageSize, int $websiteId, int $roleId): array;
     public function createWebsiteRoleUser(array $data): array;
-    public function updateWebsiteRoleUser(int $id,array $data): array;
+    public function updateWebsiteRoleUser(int $id, array $data): array;
     public function delWebsiteRoleUser(int $id): array;
     public function getWebsiteId(array $data): array;
     public function getWebsiteCategory(array $data): array;
@@ -63,26 +64,24 @@ interface WebsiteServiceInterface
     public function upWebsiteCategory(array $data): array;
     public function getWebsiteCategoryList(array $data): array;
 
-    public function delWebsiteAllCategory(array $data): array;
-    public function getWebsiteCategoryOnes(array $data): array;
-    public function upWebsiteCategoryones(array $data): array;
-    public function getWebsiteAllCategory(array $data): array;
-    public function templateSectorList(array $data): array;
-    public function sectorComponentList(array $data): array;
-    public function getWebsiteTemplateInfo(array $data): array;
-    public function addWebsiteTemplate(array $data): array;
-    public function getWebsiteTemplateData(array $data): array;
-    public function getFooterCategoryList(array $data): array;
-    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;
+    // public function delWebsiteAllCategory(array $data): array;
+    // public function getWebsiteCategoryOnes(array $data): array;
+    // public function upWebsiteCategoryones(array $data): array;
+    // public function getWebsiteAllCategory(array $data): array;
+    // public function templateSectorList(array $data): array;
+    // public function sectorComponentList(array $data): array;
+    // public function getWebsiteTemplateInfo(array $data): array;
+    // public function addWebsiteTemplate(array $data): array;
+    // public function getWebsiteTemplateData(array $data): array;
+    // public function getFooterCategoryList(array $data): array;
+    // 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;
 
     public function getWebsiteintel(array $data): array;
     public function addWebsiteTemplateintel(array $data): array;