Merge branch 'master' into dev

app-ghs/controllers/ShopExtController.php

@@ -34,6 +34,10 @@ class ShopExtController extends BaseController
         }
         $shopId = $this->shopId;
         \bizHd\shop\classes\ShopExtClass::updateByCondition(['shopId' => $shopId], $arr);
+        //零售端暂时同步更新
+        $shop = $this->shop;
+        $lsShopId = $shop->pfShopId;
+        \bizHd\shop\classes\ShopExtClass::updateByCondition(['shopId' => $lsShopId], $arr);
         util::complete('修改成功');
     }