Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-05 56f732ed7af0e82f32f809ff0797fd0b83b62306

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

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

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

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