Merge branch 'test'

application/api_broker/controller/Shop.php

@@ -707,10 +707,10 @@ class Shop extends Basic
             $result['is_upload_video'] = 1;
         }
 
-        if (!$result['is_upload_video']) {
+        if ($result['is_upload_video'] == 1) {
             $upload_video_num = $s_house->getHouseVideoNum($params['id'], 0, $this->agentId);
             if ($upload_video_num) {
-                $result['is_upload_video'] = 1;
+                $result['is_upload_video'] = 0;
             }
         }
         unset($result['external_image_id']);