Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-15 6f91919a81c92766cb6a119dfe099b83a22ef446

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java

@@ -57,6 +57,13 @@
        return AjaxResult.ok(vipService.getById(id));
    }


    @GetMapping("/getById")
    @ApiOperation(value = "通过id查会员")
    public R<TVip> getById(Integer id) {
        return R.ok(vipService.getById(id));
    }

    /**
     * 远程调用
     * @param id
@@ -95,7 +102,7 @@
     * @return
     */
    @PostMapping(value = "/getVipInfoByType")
    public R<TVip> getVipInfoByType(@RequestParam Integer type){
    public R<TVip> getVipInfoByType(@RequestParam("type") Integer type){
        switch (type){
            case 1:
                return R.ok(vipService.getOne(Wrappers.lambdaQuery(TVip.class)