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

.gitignore

@@ -13,4 +13,4 @@ yarn-error.log
 /public/files
 /public/filedownload
 .idea/workspace.xml
-app/Http/Controllers/TestsController.php
+/app/Http/Controllers/TestsController.php

app/Http/Controllers/TestsController.php

@@ -27,7 +27,7 @@ class TestsController {
 
     public function test()
     {
-        dd(345);
+        dd(34512312);
         //宁煤洗选重复摄像头
         // $this->xixuan_repeat();
 
@@ -74,4 +74,4 @@ class TestsController {
         $repeat_arr = array_diff_assoc ( $aa, $unique_arr );
         return $repeat_arr;
     }
-}
+}