Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-15 68e7d31bc6d6c4a84ffb4b423c1ccd211f16f949

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

@@ -83,6 +83,9 @@
      }
      RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderId)
            .eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0,1"));
      if(null == one){
         return R.fail("无效的售后数据");
      }
      one.setIdStr(one.getId().toString());
      one.setAddressJson(order.getAddressJson());
      return R.ok(one);