|
@@ -41,7 +41,8 @@ class GhsController extends BaseController
|
|
|
$shop = ShopClass::getShopInfo($shopId);
|
|
$shop = ShopClass::getShopInfo($shopId);
|
|
|
$shopName = $shop['shopName'] ?? '';
|
|
$shopName = $shop['shopName'] ?? '';
|
|
|
$sjName = $shop['merchantName'] ?? '';
|
|
$sjName = $shop['merchantName'] ?? '';
|
|
|
- $name = $sjName . ' ' . $shopName;
|
|
|
|
|
|
|
+ $default = $shop['default'] ?? 0;
|
|
|
|
|
+ $name = $default == 1 ? $sjName : $sjName . ' ' . $shopName;
|
|
|
$ghs = [
|
|
$ghs = [
|
|
|
'id' => 0,
|
|
'id' => 0,
|
|
|
'name' => $name,
|
|
'name' => $name,
|
shish