From 721d99ec58e38a1f586e2bed93cb8f385d1e9bc6 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 16:21:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 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 c8de997..41b5740 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
@@ -58,9 +58,27 @@
 	@PostMapping("/app-user/getVipCount")
 	R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId );
 
-	@GetMapping("/app-user/getAppUserByPhone")
-    R<AppUser> getAppUserByPhone(@RequestParam("phone") String phone);
 
 	@GetMapping("/app-user/listByIds")
 	List<AppUser> listByIds(List<String> list);
+	
+	/**
+	 * 根据用户名称模糊搜索用户列表
+	 * @param name
+	 * @return
+	 */
+	@PostMapping("/app-user/getAppUserByName")
+	R<List<AppUser>> getAppUserByName(@RequestParam("name") String name);
+	
+	/**
+	 * 根据用户电话模糊搜索用户列表
+	 * @param phone
+	 * @return
+	 */
+	@PostMapping("/app-user/getAppUserByPhone")
+	R<List<AppUser>> getAppUserByPhone(@RequestParam("phone") String phone);
+	
+	
+	@PostMapping("/app-user/getAppUserByPhone1")
+	R<AppUser> getAppUserByPhone1(String phone);
 }

--
Gitblit v1.7.1