From 5b26077c6b895dc72e7a80e6d2ddccc7b754da8e Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期日, 09 十月 2022 13:59:42 +0800
Subject: [PATCH] Merge branch '20221008' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 f5f1bd4..d34efa0 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
@@ -903,6 +903,14 @@
     R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
 
     /**
+     * 无水洗车通知推送
+     * @param phone
+     * @param orderStatus
+     * @return
+     */
+    R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+
+    /**
      * 获取城镇或村落列表
      * */
     R getCommunityList(String name,Long id);
@@ -923,6 +931,16 @@
     R tfLogin(UuLoginVO uuLoginVO);
 
     /**
+     * 三说会堂新增业务中心或专家账号
+     * */
+    R addExpertOrIndustryCenter(AdministratorsUserVO administratorsUserVO);
+
+    /**
+     * 三说会堂后台重置密码
+     * */
+    R resetPassExpertOrIndustryCenter(String account,String password);
+
+    /**
      * 用户授权
      * @param userId
      * @return

--
Gitblit v1.7.1