Merge remote-tracking branch 'origin/master'

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

@@ -143,6 +143,9 @@ class CameraApiController extends BaseController
                 $res['total_offline'] = $total - $total_online;
                 $res['rate'] = $rate;
             }else{
+                if($v->slug == 'ShuiDianFenGongSi'){
+                    $v->title = '供电分公司';
+                }
                 array_push($data,[
                     'title'=>$v->title,
                     'mine_code'=>$v->slug."_jituan",