From 8c469898c0a71224e17780696d47581de47c9ed7 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 11:23:36 +0800
Subject: [PATCH] fix: 冲突
---
src/main/java/com/mzl/flower/web/customer/SalesCustomerController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/customer/SalesCustomerController.java b/src/main/java/com/mzl/flower/web/customer/SalesCustomerController.java
index 8be1b94..c93617b 100644
--- a/src/main/java/com/mzl/flower/web/customer/SalesCustomerController.java
+++ b/src/main/java/com/mzl/flower/web/customer/SalesCustomerController.java
@@ -59,7 +59,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "售后id", required = true, dataType = "String", paramType = "query")
})
- public ResponseEntity<ReturnDataDTO<OrderSalesDTO>> cancelSales(String id){
+ public ResponseEntity<ReturnDataDTO<?>> cancelSales(String id){
salesService.cancelSales(id);
return returnData(R.SUCCESS.getCode(), null);
}
--
Gitblit v1.9.3