From bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 01 八月 2022 14:44:43 +0800
Subject: [PATCH] Merge branch 'shuangzheng2' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index e120fcc..8c2cf06 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -144,6 +144,9 @@
@GetMapping("resetPassword")
R resetPassword(@RequestParam("userId") Long userId);
+ @GetMapping("/resetPasswordAccount")
+ R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account);
+
/**
* 批量重置密码用户登录密码默认admin123456
*
@@ -536,7 +539,7 @@
* @return 协议内容
*/
@PostMapping("useragreement")
- R userAgreement(@RequestParam("type") int type);
+ R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId);
/**
* uu洗车登录
@@ -697,7 +700,7 @@
* @return 协议内容
*/
@PostMapping("agreement")
- R agreement(@RequestParam("type") Integer type);
+ R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);
/**
* 维护用户最后登录时间
@@ -1254,8 +1257,6 @@
@GetMapping("/indexData/getAreaAndStreet")
R getAreaAndStreet();
-
-
/**
* uu洗车推送
* @param washPhone
--
Gitblit v1.7.1