From 2f19e491003e3e9c5ec66c2014b5fe447363300c Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 29 Mar 2023 12:17:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminapi/controller/v1/product/StoreCategory.php   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/crmeb/app/adminapi/controller/v1/product/StoreCategory.php b/crmeb/app/adminapi/controller/v1/product/StoreCategory.php
index e908140c0..3b1c213b1 100644
--- a/crmeb/app/adminapi/controller/v1/product/StoreCategory.php
+++ b/crmeb/app/adminapi/controller/v1/product/StoreCategory.php
@@ -57,7 +57,11 @@ class StoreCategory extends AuthController
 
     /**
      * 商品分类搜索
+     * @param $type
      * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function tree_list($type)
     {
@@ -103,6 +107,9 @@ class StoreCategory extends AuthController
     /**
      * 保存新增分类
      * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function save()
     {
@@ -133,6 +140,9 @@ class StoreCategory extends AuthController
      * 更新分类
      * @param $id
      * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
      */
     public function update($id)
     {

From 497dda22a89b5cc07e79fd7eccc2ee8a5b67a2d7 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 29 Mar 2023 12:28:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=94=AF=E4=BB=98=E4=B8=8D=E5=8C=85=E9=82=AE?=
 =?UTF-8?q?=E6=97=B6=E8=BF=98=E6=89=A3=E9=99=A4=E9=82=AE=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php
index e6c66a9a3..2872f002c 100644
--- a/crmeb/app/services/order/StoreOrderServices.php
+++ b/crmeb/app/services/order/StoreOrderServices.php
@@ -2638,7 +2638,7 @@ HTML;
 
                 $data['pay_price'] = $info['pay_price'];
                 $data['pay_postage'] = $info['pay_postage'];
-                $data['offline_postage'] = sys_config('offline_postage', 0);
+                $data['offline_postage'] = (int)sys_config('offline_postage', 0);
                 $data['invalid_time'] = $time;
 
                 break;

From 63d1a60be5843c67aa16d9a9e96d114c5024d86d Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Wed, 29 Mar 2023 13:58:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/marketing/live/add_goods.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/marketing/live/add_goods.vue b/template/admin/src/pages/marketing/live/add_goods.vue
index fda3c1460..fe1b3ac14 100644
--- a/template/admin/src/pages/marketing/live/add_goods.vue
+++ b/template/admin/src/pages/marketing/live/add_goods.vue
@@ -106,7 +106,7 @@ export default {
       columns1: [
         { key: 'id', title: '商品ID' },
         { slot: 'img', title: '商品信息' },
-        { slot: 'price', title: '直播售价' },
+        { key: 'price', title: '直播售价' },
         // {
         //   key: 'price',
         //   title: '直播售价',