From 8dfa9f67a2505731910b4fb3933bb38b0869ab2d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 十二月 2024 14:33:23 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index 2c2a3cc..82ca4f2 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -104,7 +104,7 @@
@ApiOperation(value = "售后已发货操作", tags = {"我的订单-个人中心-小程序"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
- @ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string"),
+ @ApiImplicitParam(name = "code", value = "快递单号", required = true, dataType = "string")
})
public R deliverGoodsRefundPass(@PathVariable("id") Long id, @PathVariable("code") String code){
RefundPass refundPass = refundPassService.getById(id);
@@ -143,7 +143,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
@ApiImplicitParam(name = "status", value = "审核状态（2=同意，3=拒绝）", required = true, dataType = "int"),
- @ApiImplicitParam(name = "passRemark", value = "审核备注", required = false, dataType = "string"),
+ @ApiImplicitParam(name = "passRemark", value = "审核备注", required = false, dataType = "string")
})
public R authPassStatus(@PathVariable("id") Long id, @PathVariable("status") Integer status, @RequestParam("passRemark") String passRemark){
return refundPassService.authPassStatus(id, status, passRemark);
@@ -154,7 +154,7 @@
@PutMapping("/refundPassReceive/{id}")
@ApiOperation(value = "售后确认收货操作", tags = {"管理后台-售后管理"})
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long")
})
public R refundPassReceive(@PathVariable("id") Long id){
return refundPassService.refundPassReceive(id);
@@ -166,7 +166,7 @@
@GetMapping("/getRefundPassInfo/{id}")
@ApiOperation(value = "获取售后数据详情", tags = {"管理后台-售后管理", "门店后台-售后管理"})
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long"),
+ @ApiImplicitParam(name = "id", value = "售后数据id", required = true, dataType = "long")
})
public R<RefundPassInfo> getRefundPassInfo(@PathVariable("id") Long id){
RefundPassInfo refundPassInfo = refundPassService.getRefundPassInfo(id);
--
Gitblit v1.7.1