Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-15 1460d1f7de102621ad69e221eeefc101a1a2e0ff

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

@@ -17,10 +17,10 @@
   
   
   /**
    * 获取会员价格配置
    * 取获会员价格配置
    * @param vip
    * @return
    */
   @PostMapping("/goods-vip/getGoodsVip")
   R<GoodsVip> getGoodsVip(@RequestParam("vip") Integer vip);
   R<GoodsVip> getGoodsVip(@RequestParam("goodsId") Integer goodsId, @RequestParam("vip") Integer vip);
}