Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 fb6eee80334ae23a2eca8c37baeef05e86c919ed

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