Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 5ad4fb34ee60e2d90d0cdb1d974ca0f4a2f26d95

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

@@ -14,5 +14,5 @@
public interface VipGoodClient {

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