From d737a229856becf58cbc7b61b34426caf9056553 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 25 Apr 2023 15:27:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev

---
 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java
index d5a1501..195d942 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java
@@ -70,6 +70,12 @@
 	}
 
 	@Override
+	@GetMapping(USER_INFO_BY_PHONE_OR_ACCOUNT)
+	public R<List<User>> userInfoByPhoneOrAccount(String tenantId, String phone) {
+		return R.data(service.userInfoByPhoneOrAccount(tenantId, phone));
+	}
+
+	@Override
 	@GetMapping(USER_INFO_BY_TYPE)
 	public R<UserInfo> userInfo(String tenantId, String account, String userType) {
 		return R.data(service.userInfo(tenantId, account, UserEnum.of(userType)));

--
Gitblit v1.9.3