Merge branch 'zj_edit' into release_preview

# Conflicts:
#	new_admincp/applications/zsb/controllers/rent.php
#	new_admincp/applications/zsb/controllers/sell.php

new_admincp/applications/zsb/controllers/rent.php

@@ -828,10 +828,6 @@ class Rent extends MY_Controller {
 					refresh_house($uid, $tbl, $house_id);
 				}
                 $this->rent_model->action_log($companycode, $uid, $tbl, $house_id, 7);
-
-                // 上报房源房源详情地址到百度
-                $url = 'http://newrent.house365.com/api/tf-app/add-house-detail-report-job?city='. GB_CITY .'&tbl=rent&house_id=' . $house_id;
-                $this->curl_get($url);
             }
             //中间件数据提交接口
             $this->load->library('statistics');

new_admincp/applications/zsb/controllers/sell.php

@@ -1297,10 +1297,6 @@ class Sell extends MY_Controller {
 					refresh_house($uid, $tbl, $house_id);
 				}
                 $this->sell_model->action_log($companycode, $uid, $tbl, $house_id, 7);
-
-                // 上报房源房源详情地址到百度
-                $url = 'http://newrent.house365.com/api/tf-app/add-house-detail-report-job?city='. GB_CITY .'&house_id=' . $house_id;
-                $this->curl_get_contents($url);
             }
             //中间件数据提交接口
             $this->load->library('statistics');