From 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb Mon Sep 17 00:00:00 2001
From: guang <guang@guang.com>
Date: 星期五, 14 六月 2024 16:43:48 +0800
Subject: [PATCH] Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform-feign into master-stander
---
crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 9c1141f..81a5290 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
@@ -9,7 +9,7 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crmp",contextId = "crm-user")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-user")
public interface FUserService {
@PostMapping(value = "/user/info")
@@ -19,4 +19,13 @@
@PostMapping(value = "/user/getUserUnionid")
Result getUserUnionid( @RequestBody(required = false) UserDto userDto);
+ @PostMapping(value = "/user/getUserOpRecord")
+ Result getUserOpRecord( @RequestBody(required = false) UserDto userDto);
+
+ @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