Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/PublicController.php

@@ -1103,27 +1103,19 @@ class PublicController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'template_id' => 'required|integer',
-                'sector_id' => 'required|integer',
                 'component_name' => 'required|string',
                 'component_type' => 'required|integer',
                 'component_img' => 'required|string',
-                'sort_id' => 'required|integer',
                 'type_id' => 'required|integer',
             ],
             [
-                'template_id.required' => '皮肤编号不能为空',
-                'template_id.integer' => '皮肤编号必须是整数',
-                'sector_id.required' => '通栏编号不能为空',
-                'sector_id.integer' => '通栏编号必须是整数',
+
                 'component_name.required' => '组件名称不能为空',
                 'component_name.string' => '组件名称必须是字符串',
                 'component_type.required' => '组件编号不能为空',
                 'component_type.integer' => '组件编号必须是整数',
                 'component_img.required' => '组件图片不能为空',
                 'component_img.string' => '组件图片必须是字符串',
-                'sort_id.required' => '排序编号不能为空',
-                'sort_id.integer' => '排序编号必须是整数',
                 'type_id.required' => '组件类型不能为空',
                 'type_id.integer' => '组件类型必须是整数',
             ]

app/Controller/WebsiteController.php

@@ -860,6 +860,8 @@ class WebsiteController extends AbstractController
                     'monthBook' => $this->processMonthlyData($data['monthBook']),
                     'monthJobHunting' => $this->processMonthlyData($data['monthJobHunting']),
                     'monthJobRecruiting' => $this->processMonthlyData($data['monthJobRecruiting']),
+                    'monthCompany' => $this->processMonthlyData($data['monthCompany']),
+                    'monthProject' => $this->processMonthlyData($data['monthProject']),
                 ];