Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-08 66794a3e6b3feb01d4b6ae5710a0725b525a99dd

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/ChargingOrderFallbackFactory.java

@@ -16,6 +16,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PathVariable;

import java.util.List;

@@ -76,7 +77,7 @@
            }

            @Override
            public R<Long> getCar() {
            public R<Long> getCar(@PathVariable("id")String id) {
                return R.fail("获取用户最近使用车辆充电的车辆id:" + throwable.getMessage());
            }