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/portal/FuelMerchantPortalController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/portal/FuelMerchantPortalController.java b/talent-card-server/src/main/java/com/talentcard/server/business/portal/FuelMerchantPortalController.java
index d5c9c85..9622e6e 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/portal/FuelMerchantPortalController.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/portal/FuelMerchantPortalController.java
@@ -7,6 +7,7 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,8 +23,11 @@
}
@GetMapping("/{merchantId}")
- public ApiResponse<Map<String, Object>> detail(@PathVariable Long merchantId) {
- return ApiResponse.success(service.detail(merchantId));
+ public ApiResponse<Map<String, Object>> detail(
+ @PathVariable Long merchantId,
+ @RequestParam(required = false) Long talentCardId
+ ) {
+ return ApiResponse.success(service.detail(merchantId, talentCardId));
}
@PostMapping("/{merchantId}/registrations")
--
Gitblit v1.7.1