From 5c56024eeffdf374d2a041bb0f8c20935290454b Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 09 十一月 2023 15:35:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
index a7f4043..8acf876 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -77,6 +77,27 @@
     @PostMapping("/admin/export/shop/user/sleep/deduction/list")
     Result userSleepDeductionList(@RequestBody ShopReportDto shopReportDto);
 
+    /**
+     * 闂ㄥ簵-鍖荤敓鎵ц鍗犳瘮鎯呭喌
+     */
+    @PostMapping("/admin/export/shop/user/doctor/deduction/list")
+    Result userDoctorDeductionList(@RequestBody ShopReportDto shopReportDto);
+
+    /**
+     * 闂ㄥ簵-鍖荤敓鎵ц鍗犳瘮鎯呭喌-鏈堢粺璁�
+     */
+    @PostMapping("/admin/export/shop/user/doctor/deduction/list/month")
+    Result userDoctorDeductionMonthList(@RequestBody ShopReportDto shopReportDto);
+
+    /**
+     * 闂ㄥ簵-娴佸け瀹㈡埛-瀵煎嚭
+     */
+    @PostMapping("/admin/export/shop/loss/user/rate/export")
+    Result lossUserRate(@RequestBody ShopReportDto shopReportDto);
+
+    /**闂ㄥ簵-绉戝涓氱哗*/
+    @PostMapping("/admin/export/shop/room/list")
+    Result roomList(@RequestBody ShopReportDto shopReportDto);
 
 
 }

--
Gitblit v1.8.0