Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

无关风月

2025-01-15 d20a4aade6f9ed5111b496ac9abdff9f05f81535

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

@@ -92,7 +92,7 @@
      if(StringUtils.isNotEmpty(one.getExpressResult())){
         MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(one.getExpressResult(), MapTrackKD100Vo.class);
         List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
         one.setExpress(data.size() > 0 ? data.get(0).getContext() : "");
         one.setExpress(null != data && data.size() > 0 ? data.get(0).getContext() : "");
      }
      return R.ok(one);
   }