From dc72b94ed88585df5d49a90a39f723cd0364bb6d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 24 四月 2024 18:07:15 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-test

---
 crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java |    7 +++++++
 1 files changed, 7 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 4fb246d..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
@@ -21,4 +21,11 @@
 
     @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