From 76dc2f99dc21b52d771dcb7cc9c84acc2c74fcd3 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Fri, 22 Dec 2023 09:25:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/merchant/store/product/Product.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controller/merchant/store/product/Product.php b/app/controller/merchant/store/product/Product.php
index a71aba59..294ee9f5 100644
--- a/app/controller/merchant/store/product/Product.php
+++ b/app/controller/merchant/store/product/Product.php
@@ -428,7 +428,8 @@ class Product extends BaseController
     public function xlsx_import_list(){
         [$page, $limit] = $this->getPage();
         $select=Db::name('store_product_import')->where('mer_id',$this->request->merId())->page($page)->limit($limit)->select()->toArray();
-        return app('json')->success($select);
+        $count=Db::name('store_product_import')->where('mer_id',$this->request->merId())->count();
+        return app('json')->success(['list'=>$select,'count'=>$count]);
 
     }
 }