1

app/Controller/WebsiteController.php

@@ -1069,7 +1069,10 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->checkWebsiteUrl($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+<<<<<<< HEAD
 
+=======
+>>>>>>> 20241216_fr_diyweb
     /**
      * 风格板块列表
      * @return array