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 | 14 ++++++++++++++
1 files changed, 14 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 60c5c3e..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
@@ -31,6 +31,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
/**
* 用户服务Feign实现类
*
@@ -62,6 +64,18 @@
}
@Override
+ @GetMapping(USER_INFO_BY_PHONE)
+ public R<List<User>> userInfoByPhone(String tenantId, String phone) {
+ return R.data(service.userInfoByPhone(tenantId, phone));
+ }
+
+ @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