Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 fb6eee80334ae23a2eca8c37baeef05e86c919ed

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

@@ -36,8 +36,9 @@
    @Resource
    private VipGoodService vipGoodService;

    @GetMapping("/list")
    public R<List<VipSetting>> list() {
    @GetMapping("/info")
    @ApiOperation(value = "获取各级会员信息", tags = {"小程序-个人中心首页", "小程序-会员中心"})
    public R<List<VipSetting>> info() {
        List<VipSetting> list = vipSettingService.list();
        return R.ok(list);
    }
@@ -91,7 +92,18 @@

    @GetMapping("getVipSettingById")
    @ApiOperation(value = "获取会员设置")
    public R<VipSetting> getVipSettingById(@ApiParam(value = "会员id") @RequestParam Integer id) {
    public R<VipSetting> getVipSettingById(@ApiParam(value = "会员id") @RequestParam("id") Integer id) {
        return R.ok(vipSettingService.getById(id));
    }
    
    
    /**
     * 查询会员配置
     * @param id
     * @return
     */
    @PostMapping("/getVipSetting")
    public R<VipSetting> getVipSetting(@RequestParam("id") Integer id) {
        return R.ok(vipSettingService.getById(id));
    }
}