Merge branch 'liuzj-permission-dev' into test

modules/Jiesuan/Http/Controllers/BankAccountController.php

@@ -92,7 +92,7 @@ class BankAccountController extends CatchController
             })->when($createStartAt, function ($query, $createStartAt) {
                 return $query->where('created_at', '>=', $createStartAt);
             })->when($createEndAt, function ($query, $createEndAt){
-                return $query->where('created_at', '<=', $createEndAt);
+                return $query->where('created_at', '<=', $createEndAt . ' 23:59:59');
             })
             ->orderBy('id', 'desc')
             ->paginate($request->input('limit', 15));

modules/Jiesuan/Http/Controllers/JiesuanController.php

@@ -32,7 +32,7 @@ class JiesuanController extends CatchController
                 return $query->where('jiesuan_date', '>=', $jiesuanDateStartAt);
             })
             ->when($jiesuanDateEndAt, function ($query, $jiesuanDateEndAt) {
-                return $query->where('jiesuan_date', '<=', $jiesuanDateEndAt);
+                return $query->where('jiesuan_date', '<=', $jiesuanDateEndAt . ' 23:59:59');
             })
             ->orderBy('jiesuan_date', 'desc')
             ->select('id', 'jiesuan_date', 'charge_money', 'tuikuan_money', 'share_rate', 'jiesuan_money');