Merge branch 'master' into dev

app-hd/controllers/PurchaseController.php

@@ -717,8 +717,8 @@ class PurchaseController extends BaseController
                     $itemTotalAmount = $post['itemTotalAmount'] ?? 0;
                     unset($post['itemTotalAmount']);
 
-                    // sendType == 0 或 4 都要收包装费
-                    if (in_array($sendType, [0, 4])) {
+                    // sendType == 4 要收包装费
+                    if ($sendType == 4) {
                         $needAdd = \bizHd\shop\classes\ShopClass::needAddPackCost($ghsShopInfo, $customId, $sendType, $itemTotalAmount);
                         if ($needAdd) {
                             $packCost = $ghsShopInfo->packCost ?? 0;