Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-18 3f8e43bb394301b7018a03d2d38e70e1232443d6

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

@@ -15,8 +15,8 @@
public interface VipGoodClient {

    @GetMapping("/vip-good/getVipGoodsByVipId")
    public R<List<VipGood>> getVipGoodsByVipId(@RequestParam("subscribeId") Integer vipId);
    R<List<VipGood>> getVipGoodsByVipId(@RequestParam("vipId") Integer vipId);

    @GetMapping("/vip-setting/getVipSettingById")
    public R<VipSetting> getVipSettingById(@RequestParam("id") Integer id);
    R<VipSetting> getVipSettingById(@RequestParam("id") Integer id);
}