|
|
@@ -77,7 +77,7 @@ class Order extends BaseController
|
|
77
|
77
|
// 导出
|
|
78
|
78
|
$is_excel = request()->param('is_excel', 0);
|
|
79
|
79
|
|
|
80
|
|
- $result = $this->repository->merchantGetList($where, $page, $limit);
|
|
|
80
|
+ $result = $this->repository->merchantGetList($where, $page, $limit, $is_excel);
|
|
81
|
81
|
|
|
82
|
82
|
if ($is_excel == 1) {
|
|
83
|
83
|
$data = $result['list'];
|