|
@@ -1160,7 +1160,12 @@ class WebsiteController extends AbstractController
|
|
|
* @return array
|
|
|
*/
|
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
public function addWebsiteTemplateintel(){
|
|
|
+=======
|
|
|
+ public function addWebsiteTemplateintel()
|
|
|
+ {
|
|
|
+>>>>>>> 20241216_fr_diyweb
|
|
|
$requireData = $this->request->all();
|
|
|
$validator = $this->validationFactory->make(
|
|
|
$requireData,
|
|
@@ -1259,7 +1264,6 @@ class WebsiteController extends AbstractController
|
|
|
*/
|
|
|
|
|
|
public function upWebsiteTemplateintel()
|
|
|
-
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
$validationRules = [
|
|
@@ -1310,7 +1314,6 @@ class WebsiteController extends AbstractController
|
|
|
}
|
|
|
$result = $this->websiteServiceClient->upWebsiteTemplateintel($requireData);
|
|
|
return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|