From 82223863ef1e95aca19b72ab326a0e854d30ae7c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 11 十月 2022 14:34:14 +0800
Subject: [PATCH] Merge branch '20221008' into local_20221010

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   11 ++++++++++-
 1 files changed, 10 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 daca29a..5a51434 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);
 

--
Gitblit v1.7.1