Merge branch 'liuzj-1001020-dev' into test

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -17,7 +17,8 @@ class PromotionController extends CatchController
     public function list(Request $request) {
         $callbackTypeMap = [
             '0' => '无',
-            '1' => '巨量账户级回传',
+            '1' => '头条-微信(账户级)',
+            '2' => '巨量2.0事件-微信小程序',
         ];
         $linkSourceMap = [
             '0' => '',