Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-14 9c90a14b37f37cf6142e4102c52d2b27f524f76f

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

@@ -235,7 +235,6 @@
      refundPassInfo.setPassStatus(refundPass.getPassStatus());
      refundPassInfo.setPassRemark(refundPass.getPassRemark());
      refundPassInfo.setStatus(refundPass.getStatus());
      refundPassInfo.setPoint(orderInfo.getGetPoint());
      String code = refundPass.getCode();
      if(StringUtils.isNotEmpty(code)){
         JSONObject jsonObject = JSON.parseObject(code);