From 3983e5809d0ed2ce551a157a1b5b326b217c9b9c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 16:46:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 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 a3e3033..29c404c 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
@@ -539,6 +539,14 @@
R userAgreement(@RequestParam("type") int type);
/**
+ * uu洗车登录
+ * @param uuLoginVO
+ * @return
+ */
+ @PostMapping("uuLogin")
+ R uuLogin(@RequestBody UuLoginVO uuLoginVO);
+
+ /**
* 意见反馈
*
* @param sysUserFeedbackDTO
@@ -1213,4 +1221,15 @@
*/
@PostMapping("/update/user/party/status")
R updateUserPartyStatus(@RequestParam("userId") Long userId);
+
+
+ /**
+ *导出验证密码
+ */
+ @GetMapping("/checkExport")
+ R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
+
+ @GetMapping("/indexData")
+ R newIndexData(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "type",required = false) Long streetId);
}
--
Gitblit v1.7.1