From 1a6eb2ac656de3b35c64db8b9006db2ed9248872 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:43:13 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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..8b374a6 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,16 @@
      * */
     @GetMapping("/isSanShuoExpert")
     R isExpert(@RequestParam("number") String number);
+
+    /**
+     * 删除用户专家权限
+     * */
+    @GetMapping("/removeExpertRole")
+    R removeExpertRole(@RequestParam(value = "phone",required = false) String phone);
+
+    /**
+     *回复反馈意见或修改返回意见的回复
+     * */
+    @PostMapping("/feedBackReply")
+    R updateFeedBack(@RequestBody SysUserFeedbackVO sysUserFeedbackVO);
 }

--
Gitblit v1.7.1