From dde6983def69577df7b97e3aefbcc06f24a1abf4 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期一, 08 一月 2024 16:03:10 +0800 Subject: [PATCH] Merge branch 'master-prod-new' into master-test --- crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java index fbf7c9a..3f74a8a 100644 --- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java +++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java @@ -24,4 +24,8 @@ @PostMapping(value = "/user/unbindingPhis") Result unbindingPhis( @RequestBody(required = false) UserDto userDto); + + /**鍚堝苟璐﹀彿*/ + @PostMapping(value = "/user/merge/accounts") + Result mergeAccounts( @RequestBody UserDto userDto); } -- Gitblit v1.8.0