Merge branch 'liuzj-1000959-dev' into test

# Conflicts:
#	modules/Tuiguang/Http/Controllers/PromotionController.php

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -52,8 +52,9 @@ class PromotionController extends CatchController
                 return $query->where('promotions.created_at', '<=', $endTime . ' 23:59:59');
             })->orderBy('created_at', 'desc')
             ->select('promotions.id', 'promotions.name', 'promotions.created_at',
-                'videos.name as video_name', 'promotions.series_sequence', 'promotions.callback_type',
-                'promotions.callback_config_id', 'promotions.video_id', 'promotions.remark', 'promotions.status')
+            'videos.name as video_name', 'promotions.series_sequence', 'promotions.callback_type',
+                'promotions.callback_config_id', 'promotions.video_id', 'promotions.remark', 'promotions.status',
+            'promotions.first_charge_template_id', 'promotions.not_first_charge_template_id')
             ->paginate($request->input('limit', 15));
         foreach ($result as $item) {
             $item->status_str = $item->status ? '启用':'禁用';