From b020f119176dcc1c60ec1c97bd03d9a3efe8b5fa Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 06 十二月 2023 19:14:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java |   17 +++++++++++++++++
 1 files changed, 17 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 908aac6..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
@@ -83,4 +83,21 @@
     @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