From 450d98429b33d4433fa4f24a62a47790391459f6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 17:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 2 +-
1 files changed, 1 insertions(+), 1 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 3938eb7..893ae60 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
@@ -85,7 +85,7 @@
if(Arrays.asList(2, 3).contains(refundPass.getStatus())){
return R.fail("售后取消失败");
}
- refundPass.setDelFlag(1);
+// refundPass.setDelFlag(1);
refundPassService.removeById(id);
order.setOrderStatus(4);
orderService.updateById(order);
--
Gitblit v1.7.1