Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-10 18e68871f0423910f748a727ceab297a8e4765d1

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java

@@ -86,7 +86,7 @@
         return R.fail("售后取消失败");
      }
      refundPass.setDelFlag(1);
      refundPassService.updateById(refundPass);
      refundPassService.removeById(id);
      order.setOrderStatus(4);
      orderService.updateById(order);
      return R.ok();