From 3bf095fd73adb103f96aa29943e33545495dff53 Mon Sep 17 00:00:00 2001
From: liyuqian <201963020@qq.com>
Date: 星期二, 30 八月 2022 17:24:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 6 ++++++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 4 +++-
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 7 +++++++
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 9bfb10e..8e69929 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -10,7 +10,14 @@
private String id;
private String userId;
+ /**ciq*/
private String CIQ;
+ /**鍚嶇О*/
private String name;
+ /**鎵嬫満鍙�*/
private String tel;
+ /**鎵�灞為棬搴楁爣璇�*/
+ private String shopId;
+ /**鎵�灞為【闂悕绉�*/
+ private String beCorpUser;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index bfad3c8..90980cf 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -33,6 +33,12 @@
Result userList(@RequestBody UserDto userDto);
/**
+ * 鏌ヨ鐢ㄦ埛鏍囪瘑鍒楄〃
+ * */
+ @PostMapping(value = "/user/list/ids")
+ Result userIdList(@RequestBody UserDto userDto);
+
+ /**
* 鑾峰彇鍒扮敤鎴疯鎯�
* @param userId 鐢ㄦ埛鏍囪瘑
* @return 杞寲浣跨敤UserDt
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index 61f3f46..eeb2e00 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -53,6 +53,8 @@
private String userRole;
/**鐢ㄦ埛绫诲瀷*/
private String userType;
- /*鎵�灞為【闂�(閿�鍞【闂�)*/
+ /**鎵�灞為【闂�(閿�鍞【闂�)*/
private String hisCorpUserId;
+ /**鎵�灞為【闂�(閿�鍞【闂�)*/
+ private String hisCorpUser;
}
--
Gitblit v1.8.0