Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

app/models/store/SystemStockBill.php

@@ -73,7 +73,7 @@ class SystemStockBill extends BaseModel
         $model = $model->where('a.id','>',0);
         $model = $model->field('a.*,b.image,b.is_show,b.is_del,b.store_name');
         $count = $model->count();
-        $data = $model->page($where['page'],$where['limit'])->order("product_id desc")->select()->toarray();
+        $data = $model->page($where['page'],$where['limit'])->order("id desc")->select()->toarray();
         return compact('count','data');
     }