Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-28 11b718b78ee92d2349072c972e7155001693d69e

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

@@ -53,7 +53,7 @@
        for (TVipOrder tVipOrder : list) {
            tVipOrder.setUid(tVipOrder.getId().toString());
            tVipOrder.setUserUid(tVipOrder.getAppUserId().toString());
            TVip data = vipClient.getInfo(tVipOrder.getVipId()).getData();
            TVip data = vipClient.getInfo1(tVipOrder.getVipId()).getData();
            if (data!=null){
                tVipOrder.setName(data.getName());
            }