Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-18 9d9832c4fc87f8da685f055da7ea7145879b4e0b

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/RemoteVipSettingClient.java

@@ -8,9 +8,14 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;

@FeignClient(contextId = "RemoteOrderGoodsClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = RemoteVipSettingFallbackFactory.class)
import java.util.List;

@FeignClient(contextId = "RemoteVipSettingClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = RemoteVipSettingFallbackFactory.class)
public interface RemoteVipSettingClient {

    @GetMapping("/vip-setting/getVipSettingById")
    R<VipSetting> getVipSettingById(@RequestParam(value = "id",required = true) Integer id);

    @GetMapping("/vip-setting/list")
    R<List<VipSetting>> list();
}