添加模板

app/JsonRpc/WebsiteService.php

@@ -1510,8 +1510,7 @@ class WebsiteService implements WebsiteServiceInterface
     public function addWebsiteTemplate(array $data): array
     {
 
-        var_dump("接收参数：",$data['template_data']);
-        $result =  WebsiteTemplate::updateOrInsert(['website_id'=>$data['website_id']],['template_data'=>json_encode($data['template_data']),'updated_at'=>date("Y-m-d H:i:s",time())]);
+        $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);
         }else{

runtime/hyperf.pid

@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-8851
-=======
-92061
->>>>>>> 1b33ce823ae8ac1d9e8124fe598a6df8009a7a26