Merge branch 'master' into dev

biz/shop/classes/ShopClass.php

@@ -33,12 +33,12 @@ class ShopClass extends BaseClass
         $address = $shop->address ?? '';
         $hasMap = dict::getDict('hasMap');
         $shopId = $shop->id;
-        $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true, null, 'id,shopId,thirdSendFeeZd');
+        $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true, null, 'id,shopId,thirdSendFee');
         $openIntraCity = 0;
         //有地图功能
         if ($hasMap == 1) {
             //有地址功能，并且叫跑腿功能开启
-            if ($ext->thirdSendFeeZd == 1) {
+            if ($ext->thirdSendFee == 1) {
                 if (!empty($lat) && !empty($long) && !empty($address)) {
                     if (!empty($wxStoreId)) {
                         $openIntraCity = 1;