1

app/Controller/WebsiteController.php

@@ -1604,7 +1604,6 @@ class WebsiteController extends AbstractController
             $result = $this->websiteServiceClient->selectWebsiteArea($requireData);
             return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
 
-<<<<<<< HEAD
         }      
     /**
      * 获取底部导航
@@ -1666,7 +1665,5 @@ class WebsiteController extends AbstractController
         }
         $result = $this->websiteServiceClient->getFooterContentInfo($requireData);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
-=======
->>>>>>> 20241216_fr_diyweb
     }
 }