From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index 41b5740..9acea8a 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -60,8 +60,8 @@
@GetMapping("/app-user/listByIds")
- List<AppUser> listByIds(List<String> list);
-
+ List<AppUser> listByIds(@RequestParam("ids") List<Long> list);
+
/**
* 根据用户名称模糊搜索用户列表
* @param name
@@ -69,7 +69,7 @@
*/
@PostMapping("/app-user/getAppUserByName")
R<List<AppUser>> getAppUserByName(@RequestParam("name") String name);
-
+
/**
* 根据用户电话模糊搜索用户列表
* @param phone
@@ -77,8 +77,8 @@
*/
@PostMapping("/app-user/getAppUserByPhone")
R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone);
-
-
+
+
@PostMapping("/app-user/getAppUserByPhone1")
- R<AppUser> getAppUserByPhone1(String phone);
+ R<AppUser> getAppUserByPhone1(@RequestParam("phone") String phone);
}
--
Gitblit v1.7.1