创建管理员

biz/merchant/classes/MerchantClass.php

@@ -173,10 +173,9 @@ class MerchantClass extends BaseClass
 			$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $merchantId, 'auth' => '*']);
 			$roleId = $roleReturn['id'];
 		}
-		
+
 		//创建管理员
 		$adminShop = AdminShopClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
-		$admin = AdminClass::getByCondition(['merchantId' => $merchantId, 'mobile' => $mobile]);
 		if (empty($adminShop)) {
 			$adminData = [
 				'password' => password_hash($mobile, PASSWORD_BCRYPT),