From 65b57875700bf42ebd17eafa01a265e5690ce271 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期四, 10 九月 2026 09:17:56 +0800
Subject: [PATCH] 又又更新

---
 talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessController.java b/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessController.java
index 631323d..7f7af73 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessController.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessController.java
@@ -147,8 +147,10 @@
 	}
 
 	@GetMapping("/merchants/login-account-available")
-	public ApiResponse<Map<String, Object>> merchantLoginAccountAvailable(@RequestParam String account) {
-		return ApiResponse.success(adminBusinessService.merchantLoginAccountAvailable(account));
+	public ApiResponse<Map<String, Object>> merchantLoginAccountAvailable(
+			@RequestParam String account,
+			@RequestParam(required = false) Long merchantId) {
+		return ApiResponse.success(adminBusinessService.merchantLoginAccountAvailable(account, merchantId));
 	}
 
 	@PostMapping("/merchants")

--
Gitblit v1.7.1