Merge branch 'master' of http://git.jieweizhineng.com/ushio/video_system into master

Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -3031,7 +3031,7 @@ class CameraApiController extends BaseController
         $coal_washery_id = $request->query('coal_washery_id');
         $area_id = $request->query('area_id');
 
-        $classes = ['早班','中班','夜班'];
+        $classes = ['早班','中班','夜班','早班、中夜、夜班','早班、夜班','早班、中夜'];
         $risk_desc = ['高风险','中风险','低风险'];
         $risk_describe_dict = [0=>"设备日常检修、维护", 1=>"停产检修", 2=>"大中修", 3=>"计划性检修", 4=>"委外施工"];
         // 风险类型