From c11a9fc44c7b76fd37c13e1516b6f564036d897b Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 19 十二月 2023 11:36:40 +0800
Subject: [PATCH] 新增合并账号接口
---
crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java | 4 ++++
crm-platform-feign/src/main/java/com/hz/crm/feign/FUserService.java | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java b/crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java
index 7d759b5..202e236 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/dto/UserDto.java
@@ -23,4 +23,8 @@
/**娴忚璁板綍缁撴潫鏃堕棿*/
String endTime;
String remarks;
+ //淇濈暀鐨勭敤鎴锋爣璇�
+ private String persistUserId;
+ //鍚堝苟浣滃簾鐨勭敤鎴锋爣璇�
+ private String repealUserId;
}
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