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 |   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..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
@@ -9,7 +9,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="crm-platform-service",path = "/crmp",contextId = "crm-user")
+@FeignClient(name="crm-platform-service",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