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

11 months ago · 8f81abed34
parent 61d1718e14 e590ae3984
commit 8f81abed34
1 changed files with 2 additions and 2 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);