Merge branch 'develop'

app/Http/Controllers/ConfigController.php

@@ -154,7 +154,7 @@ class ConfigController extends Controller
                 //跳转类型
                 'action_type' =>[
                     'post' => '内容',
-                    'star' => '首页',
+                    'recommend' => '推荐首页',
                     'activity' => '活动',
                     'product' => '商品',
                 ],

app/Http/Controllers/NoticeRuleController.php

@@ -56,7 +56,7 @@ class NoticeRuleController extends Controller
         $validator = Validator::make($request->all(), [
             'title' => 'required|string|max:30',
             'notice_user_type' => ['required',Rule::in(0, 1, 2)],
-            'action_type' => ['required',Rule::in('post', 'star', 'activity', 'product')],
+            'action_type' => ['required',Rule::in('post', 'recommend', 'activity', 'product')],
             'action_id' => 'required_unless:action_type,star|integer|min:1',
             'content' => 'required|string|max:60',
             'send_time' => 'nullable|date',