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

Modules/Mine/Services/MineServices.php

@@ -77,7 +77,7 @@ class MineServices{
                 'title as name',
                 'parent_id as pid',
             ]
-        )->get()->toArray();
+        )->where("show", 1)->get()->toArray();
 
         if ($mine_list) {
             $mine_list = self::sortMineList($mine_list);
@@ -329,7 +329,7 @@ class MineServices{
         $result_hk = $haikang->getRegionsList();
 
         $result['data'] = $result_hk['data']['list'];
-        
+
         return $result;
     }
-}
+}