Merge branch 'master' of github.com:hainatravel/information-system

12 months ago · 45fa4dffd7
parent 0f7969af7e d2ee307924
commit 45fa4dffd7
1 changed files with 7 additions and 7 deletions
--- a/application/third_party/trainsystem/controllers/innerTrainSearch.php
+++ b/application/third_party/trainsystem/controllers/innerTrainSearch.php
@ -897,8 +897,8 @@ class innerTrainSearch extends CI_Controller{
 			exit('传参错误！');
 		}

-		//$back_json = $this->NewCtripApi($train_date,$fromStation,$toStation,true);
-		$back_json = $this->LanHaiApi($train_date,$fromStation,$toStation,true);
+		$back_json = $this->NewCtripApi($train_date,$fromStation,$toStation,true);
+		//$back_json = $this->LanHaiApi($train_date,$fromStation,$toStation,true);
 		$train_info = new stdClass();
 		$train_info = json_decode($back_json);