From 004d004ebe675134e480322f28141b16c226b1eb Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 19 Mar 2024 09:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E7=94=A8=E6=88=B7=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 route/api.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/route/api.php b/route/api.php
index 9426eb65..2b211799 100644
--- a/route/api.php
+++ b/route/api.php
@@ -714,6 +714,10 @@ Route::group('api/', function () {
     Route::get('wechat/config', 'api.Wechat/jsConfig');
     //图片验证码
     Route::get('captcha', 'api.Auth/getCaptcha');
+
+    //合并账号
+    Route::post('user/merge', 'api.auth/merge');
+
     //获取协议列表
     Route::get('agreement_lst', 'admin.system.Cache/getKeyLst')->append(['type' => 1]);
     //获取协议内容