From 2a72c5fc5cc09fe98abe21e9cedd01142b0f17c7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 22 十一月 2023 15:30:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index be97ce8..5b0b0ff 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -116,8 +116,17 @@
     @PostMapping("/admin/consultant/report/room/list")
     Result roomList(@RequestBody EmployeeReportDto employeeReportDto);
 
-    /**鍜ㄨ甯�-鍜ㄨ甯�-鍒嗙被涓氱哗*/
-    @PostMapping("/admin/consultant/report/project/type/list")
-    Result projectTypeList(@RequestBody EmployeeReportDto employeeReportDto);
+    /**鍜ㄨ甯�-鍜ㄨ甯�-鍒濊瘖鎴愪氦鐜� */
+    @PostMapping("/admin/consultant/report/first/user/rate/export")
+    Result firstRateListExport(@RequestBody EmployeeReportDto employeeReportDto);
 
+    /**鍜ㄨ甯�-寰俊鑱婂ぉ鎬绘暟鍙婄兢鑱婃暟閲�*/
+    @PostMapping("/admin/consultant/report/consultant/chat/data")
+    Result consultantWeChatData(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯堢敤鎴烽」鐩祦澶�
+     */
+    @PostMapping("/admin/consultant/report/project/loss/list/V2")
+    Result projectLossListV2(@RequestBody EmployeeReportDto employeeReportDto);
 }

--
Gitblit v1.8.0