From f8f7048d704b5305cdd6ec7e608280eeb0695f41 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 18 Aug 2024 12:29:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=8D=95=E4=BD=8D=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/store_order/StoreOrderController.php     | 4 ++--
 .../store_order_cart_info/StoreOrderCartInfoController.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/store_order/StoreOrderController.php b/app/admin/controller/store_order/StoreOrderController.php
index 2d386ac93..ba1bb475c 100644
--- a/app/admin/controller/store_order/StoreOrderController.php
+++ b/app/admin/controller/store_order/StoreOrderController.php
@@ -161,8 +161,8 @@ class StoreOrderController extends BaseAdminController
             $find=StoreProduct::where('id',$value->product_id)->find();
             $value->store_name=$find['store_name']??'';
             $value->store_info=$find['store_info']??'';
-            if(!empty($find['unit_id'])){
-                $value->unit_name=StoreProductUnit::where('id',$find['unit_id'])->value('name');
+            if(!empty($find['unit'])){
+                $value->unit_name=StoreProductUnit::where('id',$find['unit'])->value('name');
             }else{
                 $value->unit_name='';
             }
diff --git a/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php b/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php
index 8bce62073..12550706d 100644
--- a/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php
+++ b/app/admin/controller/store_order_cart_info/StoreOrderCartInfoController.php
@@ -87,8 +87,8 @@ class StoreOrderCartInfoController extends BaseAdminController
             $find=StoreProduct::where('id',$value->product_id)->find();
             $value->store_name=$find['store_name']??'';
             $value->store_info=$find['store_info']??'';
-            if(!empty($find['unit_id'])){
-                $value->unit_name=StoreProductUnit::where('id',$find['unit_id'])->value('name');
+            if(!empty($find['unit'])){
+                $value->unit_name=StoreProductUnit::where('id',$find['unit'])->value('name');
             }else{
                 $value->unit_name='';
             }