From 663defd80df239f6ad0b5249c45914c746eb20cb Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 6 Sep 2024 17:57:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86StoreProduct?=
 =?UTF-8?q?Lists.php=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=AE=A1=E7=AE=97=E7=9A=84bug=EF=BC=8C?=
 =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=BA=93=E5=AD=98=E8=AE=A1=E7=AE=97=E6=9B=B4?=
 =?UTF-8?q?=E5=8A=A0=E5=87=86=E7=A1=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/statistics/StoreProductLists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin/lists/statistics/StoreProductLists.php b/app/admin/lists/statistics/StoreProductLists.php
index f64a536d..d80652d0 100644
--- a/app/admin/lists/statistics/StoreProductLists.php
+++ b/app/admin/lists/statistics/StoreProductLists.php
@@ -116,7 +116,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
                     $item->total_price='0元';
                 }
                 if($item->total_stock){
-                    $item->total_stock=$item->total_stock.'|'.$unit_name;
+                    $item->total_stock=bcadd($item->total_stock,$item->warehouse_stock,2).'|'.$unit_name;
                 }else{
                     $item->total_stock='';
                 }