From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index ad41b7f..20f98de 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -51,7 +51,7 @@
* @param userId
* @return
*/
- @GetMapping("/user/queryRoleByUserId/{userId}")
+ @PostMapping("/user/queryRoleByUserId/{userId}")
R<SysRole> queryRoleByUserId(@PathVariable("userId") Long userId);
@@ -60,7 +60,7 @@
* @param roleId
* @return
*/
- @GetMapping("/user/queryRoleByRoleId/{roleId}")
+ @PostMapping("/user/queryRoleByRoleId/{roleId}")
R<SysRole> queryRoleByRoleId(@PathVariable("roleId") Long roleId);
/**
@@ -86,15 +86,6 @@
*/
@PostMapping("/user/queryUserByPhone")
R<SysUser> queryUserByPhone(@RequestBody String phone);
-
-
- /**
- * 根据账号获取用户数据
- * @param account
- * @return
- */
- @PostMapping("/user/queryUserByAccount")
- R<SysUser> queryUserByAccount(@RequestBody String account);
/**
* 通过账号查询用户
@@ -109,7 +100,7 @@
* @param user
*/
@PostMapping("/user/addSysUser")
- R addSysUser(SysUser user);
+ R addSysUser(@RequestBody SysUser user);
/**
@@ -118,5 +109,5 @@
* @return
*/
@PostMapping("/user/resetPassword")
- R resetPassword(SysUser user);
+ R resetPassword(@RequestBody SysUser user);
}
--
Gitblit v1.7.1