Merge remote-tracking branch 'origin/master'

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

@@ -2266,13 +2266,13 @@ class CameraApiController extends BaseController
             '灵新洗煤厂'=>'linxing',
             '红柳洗煤厂'=>'hongliu',
             '枣泉洗煤厂'=>'zaoquan',
-            '大武口洗煤厂'=>'dawukou',
+//            '大武口洗煤厂'=>'dawukou',
             '金凤洗煤厂'=>'jinfeng',
             '金能洗煤厂'=>'jinneng',
             '检修一车间'=>'jianxiuyichejian',
             '检修二车间'=>'jianxiuerchejian',
-            '检修三车间'=>'jianxiusanchejian',
-            '太西洗煤厂'=>'taixi',
+//            '检修三车间'=>'jianxiusanchejian',
+//            '太西洗煤厂'=>'taixi',
             '清水营洗煤厂'=>'qingshuiying',
             '梅花井洗煤厂'=>'meihuajing',
             '石槽村洗煤厂'=>'shicaocun',