Merge branch 'liuzj-1001020-dev' into test

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -143,7 +143,7 @@ class PromotionController extends CatchController
     public function updateCallbackConfig(Request $request) {
         $this->validate($request, [
             'id' => 'required',
-            'callback_type' => 'required|in:1',
+            'callback_type' => 'required|in:1,2',
             'callback_config_id' => 'required',
             'remark' => 'nullable|string|max:140',
         ]);