Merge branch 'liuzj-permission-dev' into test

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -29,7 +29,7 @@ class PromotionController extends CatchController
         $id = $request->input('id');
         $videoName = $request->input('video_name');
         $starTime = $request->input('start_time');
-        $endTime = $request->input('endTime');
+        $endTime = $request->input('end_time');
         $miniprogramId = $request->input('miniprogram_id');
         $result = DB::table('promotions')
             ->leftJoin('videos', 'videos.id', '=', 'promotions.video_id')