Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-14 238ad8112dc926eeaad8e327607eeba7858b8a48

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

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