From c3707eea026757745ab278757e5918f0ebf47d9a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:53:07 +0800
Subject: [PATCH] 处理冲突
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
index 527e8da..741226b 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java
@@ -78,14 +78,19 @@
return R.fail("根据用户名称模糊搜索用户列表失败：" + cause.getMessage());
}
-
- @Override
+ @Override
+ public R<List<AppUser>> getAppUserByPhone(String phone) {
+ return R.fail("根据用户电话模糊搜索用户列表失败：" + cause.getMessage());
+ }
+
+
+ @Override
public R<Void> addAppUserShop(AppUserShop appUserShop) {
return R.fail("添加失败");
}
@Override
- public R<AppUser> getAppUserByPhone(String phone) {
+ public R<AppUser> getAppUserByPhone1(String phone) {
return R.fail("通过手机号查询用户失败");
}
--
Gitblit v1.7.1