Merge branch 'master' of http://git.qiniu1314.com/Kirin/shenying

app/dao/supplier/finance/SupplierFlowingWaterDao.php

@@ -50,7 +50,7 @@ class SupplierFlowingWaterDao extends BaseDao
                 $query->with($with);
             })->when($page && $limit, function ($query) use ($page, $limit) {
                 $query->page($page, $limit);
-            })->field($field)->order('id desc')->select()->toArray();
+            })->field($field)->order('trade_time desc,id desc')->select()->toArray();
     }
 
     /**