From f4d47d91a8bf41426497a0c42c10f5a78af0259b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:48:21 +0800
Subject: [PATCH] Merge branch 'shuangzheng2' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 8bc9e2f..17c936a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -75,7 +75,7 @@
* @param type
* 用户类型 用户类型 1 小程序 2 运营平台 3 社区平台
*/
- R<LoginUserInfoVO> getUserInfo(String name, int type);
+ R<LoginUserInfoVO> getUserInfo(String name, int type,String appId);
/**
* 三端获取登录用户信息
@@ -356,7 +356,7 @@
* 所属app 1居民端app 2网格员端app 3商家端app
* @return 协议内容
*/
- R userAgreement(int type);
+ R userAgreement(int type,String appId);
/**
* 意见反馈
@@ -478,7 +478,7 @@
* 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
* @return 协议内容
*/
- R agreement(Integer type);
+ R agreement(Integer type,String appId);
/**
* 维护用户最后登录时间
@@ -904,4 +904,12 @@
* 获取城镇或村落列表
* */
R getCommunityList(String name,Long id);
+
+ /**
+ * 重置密码
+ * @param type
+ * @param account
+ * @return
+ */
+ R resetPassword(Integer type,String account);
}
--
Gitblit v1.7.1