Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-08-29 e0ea1f4a21321f145be79556896181f23f22b708

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