Merge branch 'develop'

app/Http/Controllers/NoticeRuleController.php

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