Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-06 4f228194f4ad92a1207352515948adf610235658

Merge branch 'master' into master-v2

 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));
    }
}