Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-26 a988a89e6b0cd75a5df4691eb8196c0ef9513a05

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

@@ -22,5 +22,5 @@
    * @return
    */
   @PostMapping("/goods-vip/getGoodsVip")
   R<GoodsVip> getGoodsVip(@RequestParam("vip") Integer vip);
   R<GoodsVip> getGoodsVip(@RequestParam("goodsId") Integer goodsId, @RequestParam("vip") Integer vip);
}