1

app/JsonRpc/WebsiteService.php

@@ -1509,7 +1509,6 @@ class WebsiteService implements WebsiteServiceInterface
      */
     public function addWebsiteTemplate(array $data): array
     {
-
         $result =  WebsiteTemplate::updateOrInsert(['website_id'=>$data['webSiteData']['base']['websiteId']],['template_data'=>json_encode($data['webSiteData']),'updated_at'=>date("Y-m-d H:i:s",time())]);
         if($result){
             return Result::success($result);

app/JsonRpc/WebsiteServiceInterface.php

@@ -70,7 +70,7 @@ interface WebsiteServiceInterface
     // 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 getWebsiteTemplateInfo(array $data): array;
      public function addWebsiteTemplate(array $data): array;
      public function getWebsiteTemplateData(array $data): array;
     // public function getFooterCategoryList(array $data): array;

vendor/composer/installed.php

@@ -3,11 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-<<<<<<< HEAD
-        'reference' => '7f5b599de24baabc034ff41ae5bf0be5a5d776ec',
-=======
-        'reference' => '38cd939064a4f65d00ccc6738aca35f1e0c27319',
->>>>>>> web_12_16_liu
+        'reference' => 'ac7fc06e0b44894808a1907435e9a1d19a0880b8',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -461,11 +457,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-<<<<<<< HEAD
-            'reference' => '7f5b599de24baabc034ff41ae5bf0be5a5d776ec',
-=======
-            'reference' => '38cd939064a4f65d00ccc6738aca35f1e0c27319',
->>>>>>> web_12_16_liu
+            'reference' => 'ac7fc06e0b44894808a1907435e9a1d19a0880b8',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),