Merge branch '20241216_fr_diyweb' into dev

app/Controller/FooterController.php

@@ -297,15 +297,17 @@ class FooterController extends AbstractController
             return Result::error($errorMessage);
         }
         if(isset($requireData['con_title'])){
+
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'con_title' =>'required'
+                    'list_title' =>'required'
                 ],
                 [
-                    'con_title.required' => '内容标题不能为空'
+                    'list_title.required' => '列表标题不能为空'
                 ]
             );
+            
             if($validator->fails()){
                 $errorMessage = $validator->errors()->first();
                 return Result::error($errorMessage);

app/Controller/WebsiteController.php

@@ -1355,14 +1355,10 @@ class WebsiteController extends AbstractController
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'page_type' =>'required|array|min:2',
                     'page' =>'required',
                     'pageSize' =>'required'
                 ],
                 [
-                    'page_type.required' => '页面类型不能为空',
-                    'page_type.array' => '页面类型必须是数组',
-                    'page_type.min' => '页面类型至少有两个元素',
                     'page.required' => '第几页不能为空',
                     'pageSize.required' => '每页显示条数不能为空'
                 ]