Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 fd2823afc771def7f9ea1f09d9c38ea8086aa395

 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