Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-15 4b25a348feacbc6eb1b07fe2a107e3a94c6d9c4e

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/RefundPassServiceImpl.java

@@ -110,6 +110,7 @@
      refundPass.setPhone(jsonObject.getString("phone"));
      refundPass.setAddress(jsonObject.getString("address"));
      this.save(refundPass);
      order.setOldOrderStatus(order.getOrderStatus());
      order.setOrderStatus(7);
      orderService.updateById(order);
      return R.ok();