|
|
@@ -360,7 +360,7 @@ class Reconciliation extends BaseController
|
|
360
|
360
|
[$page, $limit] = $this->getPage();
|
|
361
|
361
|
$mer_id = $this->request->merId();
|
|
362
|
362
|
$where['mer_id'] = $mer_id;
|
|
363
|
|
- $query = Db::name('enterprise_month_bill')->field('id,month ,flow,expenditure,accounting')->where($where);
|
|
|
363
|
+ $query = Db::name('enterprise_month_bill')->where($where);
|
|
364
|
364
|
$date['count'] = $query->count();
|
|
365
|
365
|
$date['list'] = $query->page($page, $limit)->order('month desc')->select();
|
|
366
|
366
|
return app('json')->success($date);
|