From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
index 46c72b7..c7bc26b 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java
@@ -10,6 +10,7 @@
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.service.member.*;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MgtFrozenMemberDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -242,12 +243,12 @@
}
@RequestMapping(value = "/mgtFrozenMember", method = RequestMethod.POST)
- @Log(title = "会员建议管理", businessType = BusinessType.UPDATE,operContent = "冻结会员")
+ @Log(title = "会员管理", businessType = BusinessType.UPDATE,operContent = "冻结会员")
@ApiOperation(value = "冻结会员")
- public R mgtReplayMemberSuggest(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ public R mgtReplayMemberSuggest(@RequestBody MgtFrozenMemberDto mgtFrozenMemberDto) {
Long userId = SecurityUtils.getUserId();
- mgtBaseGetDto.setUserId(userId);
- memberService.mgtFrozenMember(mgtBaseGetDto);
+ mgtFrozenMemberDto.setUserId(userId);
+ memberService.mgtFrozenMember(mgtFrozenMemberDto);
return R.ok();
}
}
--
Gitblit v1.7.1