Merge remote-tracking branch 'origin/master'

xuhy

2024-08-17 5a5b01fa9824a42e3eb033088a20e24c32b30dda

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/VipFallbackFactory.java

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.factory;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.feignClient.VipClient;
import org.slf4j.Logger;
@@ -28,6 +29,10 @@
                return R.fail("获取最高抵扣、最低起步价，最高折扣的会员失败:" + throwable.getMessage());

            }
            @Override
            public R<TVip> getInfo(Integer type) {
                return null;
            }

            @Override
            public R<TVip> getInfo1(Integer id) {