From 789dff7d303ec8f7bcdc64c65ed29ee508e0903d Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期五, 12 四月 2024 12:00:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test --- phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java | 19 ++++++------------- phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java | 12 ++++++++++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java index 97d3bfb..8bbd680 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/consultation/ConsultRecordDto.java @@ -159,6 +159,10 @@ //瀹汉鍚庣画鏄惁鏈夊畨鎺掍簨鎯呭拰宸ヤ綔 private String followUpWorks; + + /***瀵煎尰鐢ㄦ埛娌荤枟灞忔搷浣滄椂 鏌ヨ鍜ㄨ璁板綍闇�瑕佽緭鍏ユ牎楠屽瘑鐮� 鐢ㄦ埛ciq鍚庡洓浣�**/ + private String checkPassword; + public ConsultRecordDto() { } @@ -626,4 +630,12 @@ public void setFollowUpWorks(String followUpWorks) { this.followUpWorks = followUpWorks; } + + public String getCheckPassword() { + return checkPassword; + } + + public void setCheckPassword(String checkPassword) { + this.checkPassword = checkPassword; + } } \ No newline at end of file diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java index c87c170..6215a5a 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncSTUserImgService.java @@ -3,25 +3,18 @@ import com.hx.resultTool.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.Map; /** - * 鍚屾鍟嗘堡鐢ㄦ埛澶村儚 - * - * @Author锛氱煡鐭� - * @Date锛�2023/5/12 10:46 + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� */ -@FeignClient(name = "synchro-service", path = "/his_synchro", contextId = "synchro-st-user-img") +@FeignClient(name="synchro-service",path = "/his_synchro",contextId = "synchro-st-user") public interface SyncSTUserImgService { - /***鍚屾鍟嗘堡鐢ㄦ埛澶村儚 */ + /*** 鍚屾鍟嗗搧鐢ㄦ埛澶村儚**/ @PostMapping(value = "/st/sync/getStImgUrl") - Result syncStUserImg(Map<String,Object> userMap); - - - - - -} + Result syncStUserImg(@RequestBody Map<String,Object> userMap); +} \ No newline at end of file -- Gitblit v1.8.0