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

Modules/OpcData/Http/Controllers/Api/OpcDataController.php

@@ -391,6 +391,7 @@ class OpcDataController extends Controller
         $dataArr = array();
         $valDict = array();
         $state = 2;
+        $dataArr['hoist'][0]['state'] = $state;
         // dd($dbResult);
         foreach ($dbResult as $key => $val) {
             $devName    = $val->dev_type_name;          // 泵名