|
|
@@ -202,7 +202,7 @@ class MerchantService extends BaseService
|
|
|
}
|
|
|
$merchant = MerchantClass::getByCondition(['merchantName' => $merchantName]);
|
|
|
if (!empty($merchant)) {
|
|
|
- util::stop('已初始平台要使用的商家信息');
|
|
|
+ util::stop('平台要使用的商家信息已初始化了');
|
|
|
}
|
|
|
$data = [
|
|
|
'merchantName' => $merchantName,
|
|
|
@@ -218,5 +218,5 @@ class MerchantService extends BaseService
|
|
|
];
|
|
|
return MerchantClass::generateMerchant($data);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|