Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-11 89ff1a52320315f24912b58e4e025e35237cf367

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

@@ -106,6 +106,11 @@
    public R<VipSetting> getVipSetting(@RequestParam("id") Integer id) {
        return R.ok(vipSettingService.getById(id));
    }

    @GetMapping("/list")
    public R<List<VipSetting>> getList(){
        return R.ok(vipSettingService.list());
    }
}