Merge branch 'liuzj-1000959-dev' into test

modules/Channel/Http/Controllers/PayTemplateController.php

@@ -18,8 +18,6 @@ class PayTemplateController extends CatchController
     {
 
     }
-
-
     private $sequence_map = [
         '','位置一','位置二','位置三','位置四','位置五','位置六','位置七','位置八'
     ];

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -67,7 +67,6 @@ class PromotionController extends CatchController
                 '&link_source=' .( $linkSourceMap[$item->callback_type] ?? '') .
                 '&adid=__AID__&cid=__CID__&imei=__IMEI__&oaid=__OAID__&mac=__MAC__&os=__OS__&ip=__IP__&androidid=__ANDROIDID__&ua=__UA__&timestamp=__TS__&callback_url=__CALLBACK_URL__&projectid=__PROJECT_ID__&promotionid=__PROMOTION_ID__&advertiser_id=__ADVERTISER_ID__&campaign_id=__CAMPAIGN_ID__';
         }
-
         return $result;
 
     }