Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-25 7405ce915a649b92c51c2120b0a60b6d599454d1

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

@@ -113,6 +113,13 @@
    }


    @PostMapping("getVipSettingById1")
    public R<VipSetting> getVipSettingById1(@RequestParam("id") Integer id) {
        return R.ok(vipSettingService.getById(id));
    }



    /**
     * 查询会员配置
     * @param id