From 4f228194f4ad92a1207352515948adf610235658 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 06 九月 2024 14:40:25 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

---
 src/main/java/com/mzl/flower/web/customer/CustomerController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/customer/CustomerController.java b/src/main/java/com/mzl/flower/web/customer/CustomerController.java
index 6001878..4c552d3 100644
--- a/src/main/java/com/mzl/flower/web/customer/CustomerController.java
+++ b/src/main/java/com/mzl/flower/web/customer/CustomerController.java
@@ -82,7 +82,7 @@
 
     @GetMapping("/partner/name")
     @ApiOperation(value = "商户(花店)详情", notes = "商户(花店)详情")
-    public ResponseEntity<ReturnDataDTO<SupplierDTO>> getPartnerName(@NotBlank(message = "参数不能为空") String partnerUserId) {
-        return returnData(R.SUCCESS.getCode(),customerService.getPartnerName(partnerUserId));
+    public ResponseEntity<ReturnDataDTO<SupplierDTO>> getPartnerName(@NotBlank(message = "参数不能为空") String id) {
+        return returnData(R.SUCCESS.getCode(),customerService.getPartnerName(id));
     }
 }

--
Gitblit v1.9.3