From f2f81d8ffaf5bb5432760084edddc018534be4db Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 5 Jun 2019 16:12:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95=E4=B8=8D?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E4=BE=9B=E5=BA=94=E5=95=86id;=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0:=E5=8F=91=E9=80=81=E5=88=B0=E5=9B=BE=E5=85=B0?=
 =?UTF-8?q?=E6=9C=B5=E7=9A=84=E8=AE=A1=E5=88=92,=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=97=B6=E6=93=8D=E4=BD=9C=E9=83=A8=E9=97=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E8=AE=BE=E7=BD=AE,=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/trippestOrderSync/models/orders_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index 8e490339..7a31a671 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -544,7 +544,7 @@ class Orders_model extends CI_Model {
         $sql = "SELECT TOP 1 coli.COLI_GRI_SN,coli.COLI_SN,gci.GCI_SN
                 FROM GroupCombineInfo gci
                 INNER JOIN BIZ_ConfirmLineInfo coli ON coli.COLI_GRI_SN=gci.GCI_GRI_SN
-                WHERE gci.GCI_VendorOrderId='$vendorOrderId' and GCI_VEI_SN='$vendorID'";
+                WHERE gci.GCI_VendorOrderId='$vendorOrderId' "; // and GCI_VEI_SN='$vendorID'
         $query = $this->HT->query($sql);
         if ($query->row()) {
             $this->BIZ_COLI_SN = $query->row()->COLI_SN;