From 757b44125168fcf4cbe95d15b19e85b03bc149c9 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 11 四月 2023 10:13:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 2 +-
phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java | 2 ++
3 files changed, 11 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 aaf032b..ed54f6e 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
@@ -13,6 +13,8 @@
private String userId;
/**ciq*/
private String CIQ;
+ /**浼氬憳鍙�*/
+ private String memberNO;
/**鍚嶇О*/
private String name;
/**鎵嬫満鍙�*/
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 fa0720e..316bc8e 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
@@ -269,4 +269,12 @@
*/
@PostMapping(value = "/user/info/baseInfo")
Result userInfoBaseInfo(@RequestParam("userId") String userId);
+
+ /**
+ * 鍒ゆ柇鐢ㄦ埛鏄惁鏄細鍛�
+ * @param userDto userId
+ * @return
+ */
+ @PostMapping(value = "/user/check/member")
+ Result checkMember(@RequestBody UserDto userDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index d35d70e..cfb5337 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -73,6 +73,6 @@
* 鐢ㄦ埛鍗囩骇杩涘害
*/
@PostMapping("user/level/progress")
- Result userLevelProgress(@RequestBody JSONObject parmData);
+ Result userLevelProgress(@RequestBody JSONObject paramData);
}
\ No newline at end of file
--
Gitblit v1.8.0