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

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

@@ -3372,7 +3372,7 @@ class CameraApiController extends BaseController
                                     'risk_type'=>$risk_type[$i],
                                     'risk_level'=>$risk_list[$j]->risk_level,
                                     'unit'=>$risk_list[$j]->coal_title,
-                                    'content'=>$risk_list[$j]->risk_name ." [". $risk_list[$j]->move_camera."]",
+                                    'content'=>$risk_list[$j]->risk_name ."★",
                                     'people_count'=>$risk_list[$j]->work_num,
                                     'work_location'=>$risk_list[$j]->risk_location,
                                     'leader'=>$risk_list[$j]->work_people
@@ -3437,7 +3437,7 @@ class CameraApiController extends BaseController
                                     'risk_type'=>$risk_type[$i],
                                     'risk_level'=>$risk_list[$j]->risk_level,
                                     'unit'=>$risk_list[$j]->coal_title,
-                                    'content'=>$risk_list[$j]->risk_name ." [". $risk_list[$j]->move_camera."]",
+                                    'content'=>$risk_list[$j]->risk_name ."★",
                                     'people_count'=>$risk_list[$j]->work_num,
                                     'work_location'=>$risk_list[$j]->risk_location,
                                     'leader'=>$risk_list[$j]->work_people