小程序app-商贸区-检测问题

app/controller/api/store/merchant/Merchant.php

@@ -231,8 +231,8 @@ class Merchant extends BaseController
         if (!empty($hasProductMerIdList) && is_array($hasProductMerIdList)) {
             $query->whereIn('mer_id', $hasProductMerIdList);
         }
-        return app('json')->success(['list'=>$hasProductMerIdList]);
-//        $mer_list = $query->page($page)->limit($limit)->select();
+        $mer_list = $query->page($page)->limit($limit)->select();
+        return app('json')->success(['list'=>$mer_list]);
 //        $where['is_gift_bag'] = 0;
 //        $where['is_used'] = 1;
 //        $where['product_type'] = 0;