Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/models/orderFinance_model.php

@@ -359,7 +359,7 @@ class OrderFinance_model extends CI_Model {
                        AND ROT2_LGC=1) AS roomtype,
                    left(convert(varchar,COLD_StartDate,120),10) AS starttime,
                    left(convert(varchar,COLD_EndDate,120),10) AS endtime,
-                   COLD_Count roomnumber,
+                   CONVERT(int, COLD_Count) roomnumber,
                    isnull(HOI_ExtraNum,0) AS ExtraBedNumber,
                    DATEDIFF(DAY,COLD_StartDate,COLD_EndDate) as jianyeshu,
                     COLD_TotalCost*1.0/dbo.ZeroToOne(DATEDIFF(DAY,COLD_StartDate,COLD_EndDate)) as jianyecost,