From 2f1988b9b3047e64d1a7b85fbaf8518d16eb88ec Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 07 六月 2024 11:21:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
index d37a001..0ea2219 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/inner/MemberController.java
@@ -6,11 +6,11 @@
import com.ruoyi.system.api.domain.Member;
import java.util.List;
import java.util.Set;
+
+import com.ruoyi.system.api.domain.dto.updMembeOneDTO;
+import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author mitao
@@ -29,4 +29,18 @@
return R.ok(memberService.getMemberListByIds(memberIdList));
}
+ @PostMapping("/getMembeOne")
+ @InnerAuth
+ public R<Member> getMembeOne(@RequestBody Long userId) {
+ return R.ok(memberService.getById(userId));
+ }
+
+
+ @PostMapping("/updMembeOne")
+ @InnerAuth
+ public R updMembeOne(@RequestBody updMembeOneDTO dMembeOneDTO) {
+ memberService.updMembeOne(dMembeOneDTO);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1