Merge remote-tracking branch 'origin/master'

puzhibing

2026-03-10 487ebcc3b2db366ad7bfb6f34bd11f4ffec9e11e

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpSystemSettingClientFallbackFactory.java

@@ -3,6 +3,7 @@
import com.xiaopeng.api.feignClient.operation.SysLogClient;
import com.xiaopeng.api.feignClient.operation.XpSystemSettingClient;
import com.xiaopeng.api.model.operation.SysOperLog;
import com.xiaopeng.api.model.operation.XpFeedbackType;
import com.xiaopeng.common.core.domain.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -25,6 +26,12 @@
                log.error("获取自动结束行程时间失败:{}", cause.getMessage());
                return R.fail("获取自动结束行程时间失败，"+cause.getMessage());
            }

            @Override
            public R<XpFeedbackType> getFeedbackTypeById(Long id) {
                log.error("获取反馈类型名称失败:{}", cause.getMessage());
                return R.fail(null);
            }
        };
    }
}