From 862c693ff45bac0dca1f146a03f9c37ff30c1e91 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 十二月 2023 15:45:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java
index 49df073..bdf7045 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserInfoService.java
@@ -80,7 +80,7 @@
- ResultUtil<LoginWarpper> wxIsLogin( String jscode) throws Exception;
+ ResultUtil<LoginWarpper> wxIsLogin(Integer language, String jscode) throws Exception;
/**
@@ -90,7 +90,7 @@
* @return
* @throws Exception
*/
- ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language) throws Exception;
+ ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language,int type) throws Exception;
/**
@@ -142,7 +142,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryUserInfo(Integer uid) throws Exception;
+ Map<String, Object> queryUserInfo(Integer language, Integer uid) throws Exception;
/**
@@ -151,7 +151,7 @@
* @return
* @throws Exception
*/
- Map<String, Object> queryUser(String phone) throws Exception;
+ Map<String, Object> queryUser(Integer language, String phone) throws Exception;
/**
@@ -249,4 +249,5 @@
* @return
*/
Integer queryLanguage(Integer uid, Integer language);
+
}
--
Gitblit v1.7.1