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

application/third_party/ctmobilefirst/models/api_model.php

@@ -137,7 +137,7 @@ class Api_model extends CI_Model {
                CustomerLinePrice ON CustomerLineInfo.CLI_SN = CustomerLinePrice.CLP_CLI_SN INNER JOIN 
                CustomerLineInfo2 ON CustomerLineInfo.CLI_SN = CustomerLineInfo2.CLI2_CLI_SN 
                  where CLI_SN= ?  and CLI2_LGC=? and (CLP_Area=1 or CLP_Area=2) 
-                 and CLI_State = 1005004 ORDER BY CLP_TwoToFiveAdultPrice";
+                 and (CLI_State = 1005004 or CLI_State = 1005003) ORDER BY CLP_TwoToFiveAdultPrice";
                  $query = $this->HT->query($sql,array($CLI_SN,$this->CTLGC));
                  if ($query->num_rows()>0){
                      $reust = $query->row()->CLP_TwoToFiveAdultPrice;