From c60eea0ab4d74ab8f39a33f896e978dc591f1800 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 10 十月 2022 12:11:47 +0800
Subject: [PATCH] Merge branch 'local_20221010' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 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 c37d519..a003422 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
@@ -1268,7 +1268,16 @@
      */
     @GetMapping("/uuPush")
     R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
-
+    /**
+     * 无水洗车推送
+     * @param washPhone
+     * @param phone
+     * @param washName
+     * @param orderStatus
+     * @return
+     */
+    @GetMapping("/wsPush")
+    R wsPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
     @GetMapping("/communityList")
     R communityList(@RequestParam("name") String name, @RequestParam("id") Long  id);
 
@@ -1302,4 +1311,10 @@
      * */
     @GetMapping("/isSanShuoExpert")
     R isExpert(@RequestParam("number") String number);
+
+    /**
+     * 删除用户专家权限
+     * */
+    @GetMapping("/removeExpertRole")
+    R removeExpertRole(@RequestParam(value = "phone",required = false) String phone);
 }

--
Gitblit v1.7.1