Merge remote-tracking branch 'origin/master'

xuhy

2024-10-23 85125295c150c78d6f02bb2be3c2e0d133540e05

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

@@ -33,7 +33,9 @@
     * @return
     */
    @PostMapping("/vip/getInfo1")
    public R<TVip> getInfo1(@RequestParam("id") Integer id);
    R<TVip> getInfo1(@RequestParam("id") Integer id);


    @PostMapping(value = "/vip/getInfo")
    R<TVip> getInfo(@RequestParam("id") Integer id);