Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-25 4c1a7c9a3ca949ce878d9f5683fdafce4acbe635

 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);
}