From 923e31f9c660a648ce84ae7973cae7f72de421b8 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 16 Sep 2020 16:45:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=20?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/UserAddressController.php         | 2 +-
 app/Service/v3/Implementations/FeiePrintService.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controller/v3/UserAddressController.php b/app/Controller/v3/UserAddressController.php
index d6ba23c..0cfdd51 100644
--- a/app/Controller/v3/UserAddressController.php
+++ b/app/Controller/v3/UserAddressController.php
@@ -33,7 +33,7 @@ class UserAddressController extends BaseController
         return $this->success($res);
     }
 
-    public function get(UserAddressRequest $request)
+    public function get()
     {
         $userAddressId = $this->request->input('user_address_id');
         $res = $this->userAddressService->get($userAddressId);
diff --git a/app/Service/v3/Implementations/FeiePrintService.php b/app/Service/v3/Implementations/FeiePrintService.php
index 11127c6..859d203 100644
--- a/app/Service/v3/Implementations/FeiePrintService.php
+++ b/app/Service/v3/Implementations/FeiePrintService.php
@@ -182,7 +182,7 @@ class FeiePrintService implements FeiePrintServiceInterface
         $orderInfo .= '送货地点：' . $arr->address . '<BR>';
         $tel = substr_replace( $arr->tel, '****', 3, 4);
         $orderInfo .= '联系电话：' . $tel . '<BR>';
-        $orderInfo .= '配送时间：' . $arr->delivery_time_note . '<BR>';
+        $orderInfo .= '送达时间：' . $arr->delivery_time_note . '<BR>';