Merge branch 'liuzj-permission-dev' into test

modules/Tuiguang/Http/Controllers/PromotionController.php

@@ -50,7 +50,7 @@ class PromotionController extends CatchController
             })->when($starTime, function ($query, $startTime) {
                 return $query->where('promotions.created_at', '>=', $startTime);
             })->when($endTime, function ($query, $endTime){
-                return $query->where('promotions.created_at', '<=', $endTime);
+                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',