Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-05 5b0689db42b735f4f16e5aecb7437484b3c7d97d

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

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

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