Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-27 64a71565792d4f2e9fd31eab6e98e972c12daa86

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

@@ -1,8 +1,17 @@
package com.ruoyi.other.controller;


import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.service.VipSettingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * <p>
@@ -14,7 +23,15 @@
 */
@RestController
@RequestMapping("/vip-setting")
@Api("会员设置")
public class VipSettingController {
    @Resource
    private VipSettingService vipSettingService;

    @GetMapping("getVipSettingById")
    @ApiOperation(value = "获取会员设置")
    public R<VipSetting> getVipSettingById(@ApiParam(value = "会员id") Integer id){
        return R.ok(vipSettingService.getById(id));
    }
}