From b2d9fdab193e24d83dd5e59c22594a2b8e0dafbc Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 23 四月 2024 12:50:07 +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/BiShopSaleService.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 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..8552ce7 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,30 @@
     @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);
+
+    /**闂ㄥ簵-涓夊ぇ椤圭洰鎵ц鏁版嵁*/
+    @PostMapping("/admin/export/shop/relation/project/list/sale")
+    Result relationProjectList(@RequestBody ShopReportDto shopReportDto);
 
 }

--
Gitblit v1.8.0