Browse Source

Merge branch 'store_user_report' into develop

master
liangyuyan 5 years ago
parent
commit
7482470f00
  1. 4
      app/Admin/Controllers/StoreUserReportController.php

4
app/Admin/Controllers/StoreUserReportController.php

@ -48,10 +48,10 @@ class StoreUserReportController extends AdminController
$start = $this->input['start'] ?? null;
$end = $this->input['end'] ?? null;
if ($start !== null) {
$q->whereRaw('time >= ?',$start);
$q->whereRaw("ims_cjdc_store_account.time >= ?",$start);
}
if ($end !== null) {
$q->whereRaw('time <= ?',$end);
$q->whereRaw("ims_cjdc_store_account.time <= ?",$end);
}
})->datetime();
});

Loading…
Cancel
Save