Merge branch 'test'

application/model/OBargainModel.php

@@ -369,7 +369,7 @@ class OBargainModel extends Model
             ->join('o_order c', 'a.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
             ->join('o_partial_commission e', 'a.id = e.bargain_id', 'left')
-            ->join('o_paylog f', 'a.id = f.bargain_id', 'left')
+            //->join('o_paylog f', 'a.id = f.bargain_id', 'left')
             ->where($params)
             ->order($order_)
             ->limit($pageSize)