From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java
index f29afb7..39d0c4b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserAccountService.java
@@ -262,4 +262,31 @@
 	public UserInfo bindPhoneToLogin(String phone, String key, String appId, HttpServletRequest request)
 			throws UserAccountException;
 
+	/**
+	 * 鎵嬫満鐧诲綍闇�瑕佺粦瀹氬井淇�
+	 * @param request
+	 * @param loginType
+	 * @param vcode
+	 * @param phone
+	 * @param appId
+	 * @return
+	 * @throws UserAccountException
+	 */
+	public UserInfo loginPhoneNew(HttpServletRequest request, int loginType, String vcode, String phone, String appId)
+			throws UserAccountException;
+
+	/**
+	 * 缁戝畾寰俊鐧诲綍 + 鎵嬫満鍙穔ey
+	 * @param request
+	 * @param acceptData
+	 * @param loginType
+	 * @param code
+	 * @param appId
+	 * @param key
+	 * @return
+	 * @throws UserAccountException
+	 */
+	public UserInfo bindWXToLogin(HttpServletRequest request, AcceptData acceptData, String code, String appId,
+			String key) throws UserAccountException;
+
 }

--
Gitblit v1.8.0