From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 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 029805e..48a9b80 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,9 +903,23 @@
     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);
+
+    /**
+     * 获取所有城镇或村落列表
+     * @return
+     */
+    R getAllCommunityList();
 
     /**
      * 重置密码
@@ -945,4 +959,19 @@
      * 移除专家权限
      * */
     R removeExpertRole(String phone);
+
+    /**
+     * 回复用户反馈
+     * */
+    R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO);
+
+    /**
+     * 查看我的问题留言或者问题留言记录
+     * */
+    R myFeedBack(Long id,Integer type,Long propertyId);
+
+    /**
+     * 是否为物业公司登录
+     * */
+    R propertyCheck(String phone);
 }

--
Gitblit v1.7.1