Merge remote-tracking branch 'origin/dev' into dev

xuhy

7 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

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

@@ -37,7 +37,8 @@
    @PostMapping("/vip/getInfo1")
    R<TVip> getInfo1(@RequestParam("id") Integer id);


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